Merge pull request #34 from ypid/fix-shellcheck-warnings

Fix shell script warnings reported by shellcheck for scripts/checksum
pull/36/head
Hamish Coleman 7 years ago committed by GitHub
commit 3c2cec117f

@ -6,7 +6,9 @@
# FIXME # FIXME
# - the description file is expected to be in the current dir # - the description file is expected to be in the current dir
DESCRIPTIONS=Descriptions.txt set -o nounset -o pipefail -o errexit
DESCRIPTIONS='Descriptions.txt'
if [ "$1" == "--rm_on_fail" ]; then if [ "$1" == "--rm_on_fail" ]; then
RM_ON_FAIL=yes RM_ON_FAIL=yes
@ -15,19 +17,19 @@ fi
FILE="$1" FILE="$1"
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo need filename echo "Need filename" 2>&1
exit 1 exit 1
fi fi
LINE=$(egrep "^$FILE " "$DESCRIPTIONS") LINE=$(egrep "^$FILE " "$DESCRIPTIONS")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Unknown file $FILE" echo "Unknown file $FILE" 2>&1
exit 1 exit 1
fi fi
if [ ! -e "$FILE" ]; then if [ ! -e "$FILE" ]; then
echo "File $FILE does not exist" echo "File $FILE does not exist" 2>&1
exit 1 exit 1
fi fi
@ -35,10 +37,10 @@ EXPECT=$(echo "$LINE" | awk -- '{print $2}')
GOT=$(sha1sum "$FILE" | cut -d" " -f1) GOT=$(sha1sum "$FILE" | cut -d" " -f1)
if [ "$EXPECT" != "$GOT" ]; then if [ "$EXPECT" != "$GOT" ]; then
echo "File $FILE failed checksum check" echo "File $FILE failed checksum check" 2>&1
if [ "$RM_ON_FAIL" ]; then if [ "$RM_ON_FAIL" ]; then
rm $FILE rm "$FILE"
fi fi
exit 1 exit 1

Loading…
Cancel
Save