shellcheck: negative exit and -z vs -n

This commit is contained in:
Enno Rehling 2019-07-31 08:43:23 +02:00
parent 0fef06a661
commit ca0b2b69d0
6 changed files with 11 additions and 11 deletions

2
clibs

@ -1 +1 @@
Subproject commit 6965050165efdae89305a13bff06283229f143f4
Subproject commit 1854780fe3073e491775836c22f709668b1fff62

View File

@ -2,7 +2,7 @@
if [ -z "$ERESSEA" ]; then
echo "You need to define the \$ERESSEA environment variable to run $0"
exit -2
exit 2
fi
GAME="$ERESSEA/game-$1"
@ -16,7 +16,7 @@ fi
if [ ! -d "$GAME/reports" ]; then
echo "cannot find reports directory in $GAME"
exit -1
exit 1
fi
cd "$GAME/reports" || exit

View File

@ -5,7 +5,7 @@ if [ -z "$ERESSEA" ]; then
fi
if [ ! -f reports.txt ]; then
echo "need to run $0 from the report direcory"
exit -2
exit 2
fi
TEMPLATE=report-mail.txt

View File

@ -6,7 +6,7 @@ if [ -z "$ERESSEA" ]; then
fi
if [ ! -f reports.txt ]; then
echo "need to run $0 from the report direcory"
exit -2
exit 2
fi
PWD=$(pwd)
@ -33,7 +33,7 @@ fi
if [ ! -e "$TEMPLATE" ]; then
echo "no such email template: $TEMPLATE"
exit -3
exit 3
fi
while [ -e /tmp/.stopped ] ; do

View File

@ -3,14 +3,14 @@
if [ -z "$ERESSEA" ]; then
echo "You have to define the \$ERESSEA environment variable to run $0"
exit -2
exit 2
fi
function abort() {
if [ $# -gt 0 ]; then
echo "$@"
fi
exit -1
exit 1
}
GAME=$1
@ -47,7 +47,7 @@ fi
bash "${FACTION}.sh" "$EMAIL" || reply "Unbekannte Partei $FACTION"
OWNER=$("$BIN/getfaction.py" "$PWFILE" "$FACTION")
if [ ! -z "$OWNER" ]; then
if [ -n "$OWNER" ]; then
echo "Der Report Deiner Partei wurde an ${EMAIL} gesandt." \
| mutt -s "Reportnachforderung Partei ${FACTION}" "$OWNER"
fi

View File

@ -5,10 +5,10 @@
if [ -z "$ERESSEA" ]; then
echo "You have to define the \$ERESSEA environment variable to run $0"
exit -2
exit 2
fi
if [ ! -z "$1" ]; then
if [ -n "$1" ]; then
GAME="$ERESSEA/game-$1"
else
GAME=$ERESSEA