From 499837bd80dcd6a578b31e8cc6c70e132d481ece Mon Sep 17 00:00:00 2001 From: Martin Zuther Date: Mon, 30 Dec 2019 00:11:36 +0100 Subject: [PATCH] apply code review changes --- contrib/hooks/post_encrypt | 7 +++---- contrib/hooks/post_list | 4 ++-- contrib/hooks/post_status | 5 ++--- yadm | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/contrib/hooks/post_encrypt b/contrib/hooks/post_encrypt index d77d988..7ffce13 100755 --- a/contrib/hooks/post_encrypt +++ b/contrib/hooks/post_encrypt @@ -55,10 +55,9 @@ function get_checksum_command { # get checksum command CHECKSUM_COMMAND=$(get_checksum_command) -ERROR_CODE=$? # no command found -if [ $ERROR_CODE -ne 0 ]; then +if (($?)); then # return original exit status of yadm command exit "$YADM_HOOK_EXIT" fi @@ -67,7 +66,7 @@ fi echo -n > "$YADM_CHECKSUMS" # calculate checksums for encrypted files -for included in ${YADM_ENCRYPT_INCLUDE_FILES[*]}; do +for included in "${YADM_ENCRYPT_INCLUDE_FILES[@]}"; do # highlight any errors in red echo -en "\033[0;31m" @@ -79,7 +78,7 @@ for included in ${YADM_ENCRYPT_INCLUDE_FILES[*]}; do echo -ne "\033[0m" # handle errors - if [ $ERROR_CODE -ne 0 ]; then + if (($ERROR_CODE)); then # display warning in bright yellow echo -e "\033[1;33m" >&2 echo -n "WARNING: an error occurred. Please inspect the checksum file." >&2 diff --git a/contrib/hooks/post_list b/contrib/hooks/post_list index 0cc65c4..6c6acf0 100755 --- a/contrib/hooks/post_list +++ b/contrib/hooks/post_list @@ -30,7 +30,7 @@ fi # list all files or only those in the subdirectories below? OPTION_LIST_ALL=0 -for argument in ${YADM_HOOK_FULL_COMMAND[*]}; do +for argument in "${YADM_HOOK_FULL_COMMAND[@]}"; do # mimick git ls-files by displaying all files when not on work # path if [ "$argument" = "-a" ] || [ $ON_WORK_PATH -eq 0 ]; then @@ -63,7 +63,7 @@ while IFS= read -r filename; do else echo "$filename" fi -done <<< "$(cat "$YADM_CHECKSUMS")" +done < "$YADM_CHECKSUMS" # return original exit status of yadm command exit "$YADM_HOOK_EXIT" diff --git a/contrib/hooks/post_status b/contrib/hooks/post_status index e13b599..137af04 100755 --- a/contrib/hooks/post_status +++ b/contrib/hooks/post_status @@ -61,10 +61,9 @@ fi # get checksum command CHECKSUM_COMMAND=$(get_checksum_command) -ERROR_CODE=$? # no command found -if [ $ERROR_CODE -ne 0 ]; then +if (($?)); then # return original exit status of yadm command exit "$YADM_HOOK_EXIT" fi @@ -75,7 +74,7 @@ YADM_CHECKSUM_OUTPUT=$($CHECKSUM_COMMAND --check "$YADM_CHECKSUMS" 2>&1) ERROR_CODE=$? # handle mismatched checksums and errors -if [ $ERROR_CODE -ne 0 ]; then +if (($ERROR_CODE)); then echo echo "Some SHA-256 sums do not match (or an error occurred):" diff --git a/yadm b/yadm index 0a642aa..f164b16 100755 --- a/yadm +++ b/yadm @@ -1837,7 +1837,7 @@ function auto_bootstrap() { function join_string { local IFS="$1" - echo "${*:2}" + printf "%s" "${*:2}" } # ****** Prerequisites Functions ******