From b4a4893b0b69207eb9189a0be857a64173c09275 Mon Sep 17 00:00:00 2001 From: Darshaka Pathirana Date: Fri, 5 Mar 2021 15:52:36 +0100 Subject: [PATCH] usr_sbin/grml-chroot: Fix a couple of shellcheck warnings - SC2086: Double quote to prevent globbing and word splitting. - SC2145: Argument mixes string and array. Use * or separate argument. - SC2086: Double quote to prevent globbing and word splitting. - SC2155: Declare and assign separately to avoid masking return values. - SC2086: Double quote to prevent globbing and word splitting. - SC2004: $/${} is unnecessary on arithmetic variables. - SC2230: which is non-standard. Use builtin 'command -v' instead. - SC2236: Use -n instead of ! -z. --- usr_sbin/grml-chroot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/usr_sbin/grml-chroot b/usr_sbin/grml-chroot index e8ed430..8fcdabf 100755 --- a/usr_sbin/grml-chroot +++ b/usr_sbin/grml-chroot @@ -6,14 +6,14 @@ # License: This file is licensed under the GPL v2. ################################################################################ -PROG_NAME_=$(basename $0) +PROG_NAME_=$(basename "$0") DEST_="" MOUNTED_="" # all mounted destinations function die { - echo "Error: $@" >&2 + echo "Error: $*" >&2 exit 1 } @@ -50,12 +50,13 @@ function mountit else all_options_="-t $type_ none" fi - mount $all_options_ "${DEST_}/$dest_" && storeMounts "$dest_" + mount "$all_options_" "${DEST_}/$dest_" && storeMounts "$dest_" } function umount_all { - local reverse=$(echo $MOUNTED_ | awk '{ for (i=NF; i>1; i--) printf("%s ",$i); print $1; }') + local reverse + reverse=$(echo "$MOUNTED_" | awk '{ for (i=NF; i>1; i--) printf("%s ",$i); print $1; }') for i in $reverse; do umount "${DEST_}/$i" done @@ -72,14 +73,14 @@ while getopts "h" opt; do ?) printUsage; exit 64 ;; esac done -shift $(($OPTIND - 1)) +shift $((OPTIND - 1)) if (( $# < 1 )); then printUsage die "Wrong number of arguments." fi -if ! which awk >/dev/null 2>&1 ; then +if ! command -v awk >/dev/null 2>&1 ; then die "No awk binary found, required for execution." fi @@ -122,7 +123,7 @@ else fi umount_all -if [ ! -z "$WROTE_DEBIAN_CHROOT" ]; then +if [ -n "$WROTE_DEBIAN_CHROOT" ]; then rm "$DEST_"/etc/debian_chroot fi -- 2.1.4