From e28443a12e2e6d25a94a28195368e808d9da95ab Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Wed, 11 Apr 2018 21:30:19 +0200 Subject: [PATCH] [archivers] shellcheck --- archivers/lz.sh | 42 +++++++++++++++++++++--------------------- archivers/xzize.sh | 3 +-- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/archivers/lz.sh b/archivers/lz.sh index 9ce5245..7020845 100755 --- a/archivers/lz.sh +++ b/archivers/lz.sh @@ -19,14 +19,14 @@ ## Verify program name ## -PROGRAM="`basename $0`" +PROGRAM="$(basename "$0")" if [ "$PROGRAM" = "lz" ] ; then ACTION="t" elif [ "$PROGRAM" = "uz" ] ; then ACTION="x" else - echo '$0 = "'"$0"' (not "lz" nor "uz")!' >&2 + printf 'Error! Program name is "%s" (not "lz" nor "uz")!\n' "$PROGRAM" >&2 exit 1 fi @@ -49,38 +49,38 @@ for F in "$@" ; do fi # Simple Tar archive - if [ "`basename "$F" .tar`" != "$F" ] ; then + if [ "$(basename "$F" .tar)" != "$F" ] ; then FORMAT="" - # GZipped Tar - elif [ "`basename "$F" .tar.gz`" != "$F" \ - -o "`basename "$F" .tgz`" != "$F" ] ; then - FORMAT="--gzip" + # GZipped Tar + elif [ "$(basename "$F" .tar.gz)" != "$F" ] || \ + [ "$(basename "$F" .tgz)" != "$F" ] ; then + FORMAT="--gzip" # BZipped Tar - elif [ "`basename "$F" .tar.bz2`" != "$F" \ - -o "`basename "$F" .tbz`" != "$F" \ - -o "`basename "$F" .tb2`" != "$F" ] ; then - FORMAT="--bzip" + elif [ "$(basename "$F" .tar.bz2)" != "$F" ] || \ + [ "$(basename "$F" .tbz)" != "$F" ] || \ + [ "$(basename "$F" .tb2)" != "$F" ] ; then + FORMAT="--bzip" # XZipped Tar - elif [ "`basename "$F" .tar.xz`" != "$F" \ - -o "`basename "$F" .txz`" != "$F" ] ; then - FORMAT="--xz" + elif [ "$(basename "$F" .tar.xz)" != "$F" ] || \ + [ "$(basename "$F" .txz)" != "$F" ] ; then + FORMAT="--xz" # Compressed Tar - elif [ "`basename "$F" .tar.Z`" != "$F" \ - -o "`basename "$F" .taz`" != "$F" ] ; then - FORMAT="--compress" + elif [ "$(basename "$F" .tar.Z)" != "$F" ] || \ + [ "$(basename "$F" .taz)" != "$F" ] ; then + FORMAT="--compress" # LZMA compressed Tar - elif [ "`basename "$F" .tar.lzma`" != "$F" \ - -o "`basename "$F" .tlz`" != "$F" ] ; then - FORMAT="--lzma" + elif [ "$(basename "$F" .tar.lzma)" != "$F" ] || \ + [ "$(basename "$F" .tlz)" != "$F" ] ; then + FORMAT="--lzma" # Unknown extension else - echo "Extension of file « $F » unknown! (skipping)" >&2 + printf 'Extension of file "%s" unknown! (skipping)\n' "$F" >&2 continue fi diff --git a/archivers/xzize.sh b/archivers/xzize.sh index 1969f84..09d9ea9 100755 --- a/archivers/xzize.sh +++ b/archivers/xzize.sh @@ -28,7 +28,6 @@ COMPRESSION_LEVEL= test_extension() { - local - FILE EXTENSION BASE FILE="$1" EXTENSION="$2" NEWEXTENSION=xz @@ -36,7 +35,7 @@ test_extension() NEWEXTENSION="$3" fi - BASE="`basename "$FILE" ."$EXTENSION"`" + BASE="$(basename "$FILE" ."$EXTENSION")" if [ "$BASE" != "$FILE" ] ; then DEST="$BASE".$NEWEXTENSION return 0