[archivers] shellcheck

This commit is contained in:
Matteo Cypriani 2018-04-11 21:30:19 +02:00
parent 8f71967758
commit e28443a12e
2 changed files with 22 additions and 23 deletions

View File

@ -19,14 +19,14 @@
## Verify program name ## ## Verify program name ##
PROGRAM="`basename $0`" PROGRAM="$(basename "$0")"
if [ "$PROGRAM" = "lz" ] ; then if [ "$PROGRAM" = "lz" ] ; then
ACTION="t" ACTION="t"
elif [ "$PROGRAM" = "uz" ] ; then elif [ "$PROGRAM" = "uz" ] ; then
ACTION="x" ACTION="x"
else else
echo '$0 = "'"$0"' (not "lz" nor "uz")!' >&2 printf 'Error! Program name is "%s" (not "lz" nor "uz")!\n' "$PROGRAM" >&2
exit 1 exit 1
fi fi
@ -49,38 +49,38 @@ for F in "$@" ; do
fi fi
# Simple Tar archive # Simple Tar archive
if [ "`basename "$F" .tar`" != "$F" ] ; then if [ "$(basename "$F" .tar)" != "$F" ] ; then
FORMAT="" FORMAT=""
# GZipped Tar # GZipped Tar
elif [ "`basename "$F" .tar.gz`" != "$F" \ elif [ "$(basename "$F" .tar.gz)" != "$F" ] || \
-o "`basename "$F" .tgz`" != "$F" ] ; then [ "$(basename "$F" .tgz)" != "$F" ] ; then
FORMAT="--gzip" FORMAT="--gzip"
# BZipped Tar # BZipped Tar
elif [ "`basename "$F" .tar.bz2`" != "$F" \ elif [ "$(basename "$F" .tar.bz2)" != "$F" ] || \
-o "`basename "$F" .tbz`" != "$F" \ [ "$(basename "$F" .tbz)" != "$F" ] || \
-o "`basename "$F" .tb2`" != "$F" ] ; then [ "$(basename "$F" .tb2)" != "$F" ] ; then
FORMAT="--bzip" FORMAT="--bzip"
# XZipped Tar # XZipped Tar
elif [ "`basename "$F" .tar.xz`" != "$F" \ elif [ "$(basename "$F" .tar.xz)" != "$F" ] || \
-o "`basename "$F" .txz`" != "$F" ] ; then [ "$(basename "$F" .txz)" != "$F" ] ; then
FORMAT="--xz" FORMAT="--xz"
# Compressed Tar # Compressed Tar
elif [ "`basename "$F" .tar.Z`" != "$F" \ elif [ "$(basename "$F" .tar.Z)" != "$F" ] || \
-o "`basename "$F" .taz`" != "$F" ] ; then [ "$(basename "$F" .taz)" != "$F" ] ; then
FORMAT="--compress" FORMAT="--compress"
# LZMA compressed Tar # LZMA compressed Tar
elif [ "`basename "$F" .tar.lzma`" != "$F" \ elif [ "$(basename "$F" .tar.lzma)" != "$F" ] || \
-o "`basename "$F" .tlz`" != "$F" ] ; then [ "$(basename "$F" .tlz)" != "$F" ] ; then
FORMAT="--lzma" FORMAT="--lzma"
# Unknown extension # Unknown extension
else else
echo "Extension of file « $F » unknown! (skipping)" >&2 printf 'Extension of file "%s" unknown! (skipping)\n' "$F" >&2
continue continue
fi fi

View File

@ -28,7 +28,6 @@ COMPRESSION_LEVEL=
test_extension() test_extension()
{ {
local - FILE EXTENSION BASE
FILE="$1" FILE="$1"
EXTENSION="$2" EXTENSION="$2"
NEWEXTENSION=xz NEWEXTENSION=xz
@ -36,7 +35,7 @@ test_extension()
NEWEXTENSION="$3" NEWEXTENSION="$3"
fi fi
BASE="`basename "$FILE" ."$EXTENSION"`" BASE="$(basename "$FILE" ."$EXTENSION")"
if [ "$BASE" != "$FILE" ] ; then if [ "$BASE" != "$FILE" ] ; then
DEST="$BASE".$NEWEXTENSION DEST="$BASE".$NEWEXTENSION
return 0 return 0