From 6648a1e9688b4cdd971d6c68b568f4fd8b43ce15 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 19 Feb 2023 15:20:57 -0300 Subject: *.sh: use consistent indentation Almost all of the shell scripts in the repository use tabs for indentation (or have no indentation at all): $ git grep -Il '^\t' -- '*.sh' | wc -l 19 $ git grep -Il '^ ' -- '*.sh' | wc -l 5 $ git grep -IL '^[ \t]' -- '*.sh' | wc -l 25 So do the same in the few shell scripts that currently use spaces for indentation. Except for the following file: * platform/rpm/mkrpm.sh Not sure if it's following a packaging-specific scheme, so just fix the one indentation inconsistency in it and otherwise leave it as is for now. Command used to search for shell scripts using spaces for indentation: $ git grep -In '^ ' -- '*.sh' --- contrib/gdb-firejail.sh | 8 ++++---- contrib/syscalls.sh | 34 +++++++++++++++++----------------- platform/rpm/mkrpm.sh | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contrib/gdb-firejail.sh b/contrib/gdb-firejail.sh index b00cc65bc..032b031f0 100755 --- a/contrib/gdb-firejail.sh +++ b/contrib/gdb-firejail.sh @@ -13,11 +13,11 @@ set -x # setuid firejail process from the absolute beginning. if [ -z "${1##*/firejail}" ]; then - FIREJAIL=$1 + FIREJAIL=$1 else - # First argument is not named firejail, then add default unless environment - # variable already set. - set -- ${FIREJAIL:=$(command -v firejail)} "$@" + # First argument is not named firejail, then add default unless environment + # variable already set. + set -- ${FIREJAIL:=$(command -v firejail)} "$@" fi bash -c "kill -STOP \$\$; exec \"\$0\" \"\$@\"" "$@" & diff --git a/contrib/syscalls.sh b/contrib/syscalls.sh index 2c5bdf5ec..aece84e72 100755 --- a/contrib/syscalls.sh +++ b/contrib/syscalls.sh @@ -8,22 +8,22 @@ SYSCALLS_OUTPUT_FILE="$(pwd)/syscalls.txt" if [ $# -eq 0 ] then - echo - echo " *** No program specified!!! ***" - echo - echo -e "Make this file executable and execute it as:\\n" - echo -e "\\e[96m syscalls.sh /full/path/to/program\\n" - echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n" - echo -e "\\e[96m ./syscalls.sh /full/path/to/program\\n" - echo -e "\\e[39mUse the full path to the respective program to avoid executing it sandboxed with Firejail\\n(if a Firejail profile for it already exits and 'sudo firecfg' was executed earlier)\\nin order to determine the necessary system calls." - echo - exit 0 + echo + echo " *** No program specified!!! ***" + echo + echo -e "Make this file executable and execute it as:\\n" + echo -e "\\e[96m syscalls.sh /full/path/to/program\\n" + echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n" + echo -e "\\e[96m ./syscalls.sh /full/path/to/program\\n" + echo -e "\\e[39mUse the full path to the respective program to avoid executing it sandboxed with Firejail\\n(if a Firejail profile for it already exits and 'sudo firecfg' was executed earlier)\\nin order to determine the necessary system calls." + echo + exit 0 else - strace -cfo "$STRACE_OUTPUT_FILE" "$@" && awk '{print $NF}' "$STRACE_OUTPUT_FILE" | sed '/syscall\|-\|total/d' | sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' > "$SYSCALLS_OUTPUT_FILE" - echo - echo -e "\e[39mThese are the sorted syscalls:\n\e[93m" - cat "$SYSCALLS_OUTPUT_FILE" - echo - echo -e "\e[39mThe sorted syscalls were saved to:\n\e[96m$SYSCALLS_OUTPUT_FILE\n\e[39m" - exit 0 + strace -cfo "$STRACE_OUTPUT_FILE" "$@" && awk '{print $NF}' "$STRACE_OUTPUT_FILE" | sed '/syscall\|-\|total/d' | sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' > "$SYSCALLS_OUTPUT_FILE" + echo + echo -e "\e[39mThese are the sorted syscalls:\n\e[93m" + cat "$SYSCALLS_OUTPUT_FILE" + echo + echo -e "\e[39mThe sorted syscalls were saved to:\n\e[96m$SYSCALLS_OUTPUT_FILE\n\e[39m" + exit 0 fi diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh index 34104c7b2..d32ccd360 100755 --- a/platform/rpm/mkrpm.sh +++ b/platform/rpm/mkrpm.sh @@ -31,7 +31,7 @@ fi tmpdir=$(mktemp -d) mkdir -p ${tmpdir}/{BUILD,RPMS,SOURCES,SPECS,SRPMS} function cleanup { - rm -rf ${tmpdir} + rm -rf ${tmpdir} } trap cleanup EXIT -- cgit v1.2.3-54-g00ecf