Fix/silence shellcheck warnings.

Author: eldering

check_build_structure.sh

@@ -13,25 +13,26 @@ GITURL="https://github.com/DOMjudge/domjudge.git"
 quiet()
 {
 	if [ "$DEBUG" ]; then
-		$@
+		"$@"
 	else
-		$@ > /dev/null 2>&1
+		"$@" > /dev/null 2>&1
 	fi
 }
 
-TEMPDIR=`mktemp -d /tmp/domjudge-check_build-XXXXXX`
-cd $TEMPDIR
+TEMPDIR=$(mktemp -d /tmp/domjudge-check_build-XXXXXX)
+cd "$TEMPDIR"
 
 git clone -q --no-checkout --depth 1 "$GITURL" dj-clone
 
 ( cd dj-clone && git archive --prefix=domjudge/ --format=tar refs/heads/main ) | tar x
 
 # Add released tag for revision information:
-sed -i "s/PUBLISHED =.*/PUBLISHED = `date +%Y-%m-%d`/" domjudge/paths.mk.in
+sed -i "s/PUBLISHED =.*/PUBLISHED = $(date +%Y-%m-%d)/" domjudge/paths.mk.in
 
 quiet make -C domjudge dist
 
 # Remove date output from generated file tags to make diffs cleaner:
+# shellcheck disable=SC2016
 sed -i 's/ on `date`//' domjudge/paths.mk.in
 
 cp -a domjudge configured
@@ -57,7 +58,7 @@ diff -r -u2 domjudge distclean
 if [ "$DEBUG" ]; then
 	echo "Generated files left in $TEMPDIR"
 else
-	rm -rf $TEMPDIR
+	rm -rf "$TEMPDIR"
 fi
 
 exit 0

cron_tag_release.sh

@@ -12,14 +12,14 @@ notify_channel () {
     echo "$1"
     # When cron is run often one should have time to
     # fix the issue.
-    if [ ! -f /tmp/$2 ]; then
+    if [ ! -f "/tmp/$2" ]; then
         # Write to syslog on server
         logger "$1"
         DATA='{"text":"'"$1"'"}'
         # Notify DOMjudge Slack channel (github-notifications)
         # SLACK_URL should be exported in the .bashrc (it should be secret)
         curl -X POST -H 'Content-type: application/json' --data "$DATA" "$SLACK_URL"
-        touch /tmp/$2
+        touch "/tmp/$2"
     fi
 }
 
@@ -39,10 +39,10 @@ process_tag () {
        # gpg --search 780355B5EA6BFC8235A99C4B56F61A79401DAC04
        # And if one trusts the internet to be correct
        # gpg --recv-keys 780355B5EA6BFC8235A99C4B56F61A79401DAC04
-       if git verify-tag $TAG; then
+       if git verify-tag "$TAG" ; then
            # At this point the tarball should already be locally tested
            ~/domjudge-scripts/make_release.sh "$TAG"
-           mv domjudge-$TAG.* $RELEASE_DIR/
+           mv domjudge-"$TAG".* $RELEASE_DIR/
            notify_channel "Tarball finished ($TAG).\nURL: https://www.domjudge.org/releases/domjudge-$TAG.tar.gz" "$TAG"
        else
            notify_channel "Untrusted tag ($TAG)" "$TAG"

dump_demoweb_db.sh

@@ -7,7 +7,7 @@ set -e
 DBNAME='domjudge_demo2018'
 DUMPFILE=~/demoweb/${DBNAME}-$(date +%F).sql
 
-mysqldump $DBNAME | process-mysqldump > $DUMPFILE
+mysqldump $DBNAME | process-mysqldump > "$DUMPFILE"
 
 cat <<EOF
 

make_release.sh

@@ -9,7 +9,7 @@ if [ -z "$CI_USAGE" ]; then
 else
     set -eux
     export PS4='(${0}:): - [$?] $ '
-fi 
+fi
 
 GITURL="https://github.com/DOMjudge/domjudge.git"
 
@@ -54,7 +54,7 @@ CHLOG_VERSION="$(echo "$CHLOG" | sed -r 's/^Version ([0-9\.]+) .*$/\1/')"
 if [ "$VERSION" != "$CHLOG_VERSION" ]; then
     echo "WARNING: version strings in README* and ChangeLog differ:"
     echo "'$VERSION' != '$CHLOG_VERSION'"
-    if [ ! -t 1 && -z ${CI+x} ] ; then
+    if [ ! -t 1 ] && [ -z ${CI+x} ] ; then
         # In the cronjob this would be reason to not release
         exit 1
     fi

make_snapshot.sh

@@ -4,12 +4,14 @@
 # the public page at https://www.domjudge.org/snapshot/. Alternatively,
 # when a git URL is passed only a snapshot package is generated.
 
+# shellcheck disable=SC2086 # globally for PUBDIR, DJDIR, TEMPDIR
+
 set -e
 
 #DEBUG=1
 
 PUBDIR=~/public_html/snapshot
-DJDIR=domjudge-snapshot-`date +%Y%m%d`
+DJDIR=domjudge-snapshot-$(date +%Y%m%d)
 GITURL="https://github.com/DOMjudge/domjudge.git"
 
 # If a git repo URL is passed, don't update the website.
@@ -22,35 +24,35 @@ fi
 quiet()
 {
 	if [ "$DEBUG" ]; then
-		$@
+		"$@"
 	else
-		$@ > /dev/null 2>&1
+		"$@" > /dev/null 2>&1
 	fi
 }
 
-TEMPDIR=`mktemp -d /tmp/domjudge-make_snapshot-XXXXXX`
+TEMPDIR=$(mktemp -d /tmp/domjudge-make_snapshot-XXXXXX)
 cd $TEMPDIR
 
 git clone -q --no-checkout --depth 1 "$GITURL" dj-clone
 
 ( cd dj-clone && git archive --prefix=$DJDIR/ --format=tar refs/heads/main ) | tar x
 
 # Add released tag for revision information:
-sed -i "s/PUBLISHED =.*/PUBLISHED = `date +%Y-%m-%d`/" $DJDIR/paths.mk.in
+sed -i "s/PUBLISHED =.*/PUBLISHED = $(date +%Y-%m-%d)/" "$DJDIR/paths.mk.in"
 
 quiet make -C $DJDIR dist
 tar -cf $DJDIR.tar $DJDIR
 gzip -9 $DJDIR.tar
 
 if [ -n "$PUBDIR" ]; then
-	rm -rf $PUBDIR/*
+	rm -rf ${PUBDIR:?}/*
 	mkdir -p $PUBDIR/manual
 	cp -r $DJDIR/doc/manual/build/html/*                $PUBDIR/manual/
 	cp $DJDIR/doc/manual/build/domjudge-team-manual.pdf $PUBDIR/
 	cp $DJDIR.tar.gz $DJDIR/ChangeLog                   $PUBDIR/
 	cd /
 fi
 
-[ "$DEBUG" ] || rm -rf $TEMPDIR
+[ "$DEBUG" ] || rm -rf "$TEMPDIR"
 
 exit 0

run_html_validation.sh

@@ -21,13 +21,13 @@ VNUCHECKER=~/vnu_html_checker/vnu.jar
 quiet()
 {
 	if [ "$DEBUG" ]; then
-		$@
+		"$@"
 	else
-		$@ > /dev/null 2>&1
+		"$@" > /dev/null 2>&1
 	fi
 }
 
-TEMPDIR=`mktemp -d /tmp/dj_html_validate-XXXXXX`
+TEMPDIR=$(mktemp -d /tmp/dj_html_validate-XXXXXX)
 
 cd ~
 
@@ -115,8 +115,8 @@ check_html ()
 {
 	set +e
 	url="$LIVEURLPREFIX$1"
-	TEMP=$TEMPDIR/`echo "$1" | sed 's!/!_!g'`.html
-	curl -s -L -g ${USER:+-u$USER:$PASS} "$url" > $TEMP
+	TEMP="$TEMPDIR/$(echo "$1" | sed 's!/!_!g').html"
+	curl -s -L -g ${USER:+-u$USER:$PASS} "$url" > "$TEMP"
 	# Filter out some unfixable errors and normalize file/URL output:
 	java -jar $VNUCHECKER "$TEMP" 2>&1 | \
 		grep -v 'error: Attribute .*sorttable_customkey.* not allowed on element' | \
@@ -131,6 +131,6 @@ for i in $URLS ; do
 done
 IFS="$OFS"
 
-[ "$DEBUG" ] || rm -rf $TEMPDIR
+[ "$DEBUG" ] || rm -rf "$TEMPDIR"
 
 exit 0

update_demoweb.sh

@@ -2,6 +2,8 @@
 # Script to update the DOMjudge demo webinterface
 # at:    https://www.domjudge.org/demoweb/
 
+# shellcheck disable=SC2086 # globally for MYSQLOPTS twice
+
 set -e
 
 MYSQLOPTS=''

update_docs.sh

@@ -7,8 +7,8 @@ TMPDIR=$(mktemp -d -t 'update_docs-XXXXXX')
 DOC_REPO="$TMPDIR/domjudge"
 git clone https://github.com/DOMjudge/domjudge.git "$DOC_REPO"
 
-for version in `cat "${JSON}" | jq -r -c '.[]'`; do
-	rm -rf "${WEBSERVER_PATH}/${version}"
+for version in $(jq -r -c '.[]' < "${JSON}") ; do
+	rm -rf "${WEBSERVER_PATH:?}/${version}"
 	mkdir -p "${WEBSERVER_PATH}/${version}"
 	(
 		cd "$DOC_REPO"