Fix shellcheck issues in live-image scripts.

Author: eldering

live-image/install.sh

@@ -51,9 +51,10 @@ if [ -z "$ON_TARGET_HOST" ]; then
 	fi
 	TARGET="$1"
 	shift
-	make -C `dirname $0` `basename $EXTRA`
-	scp "$0" `dirname $0`/`basename $EXTRA` "root@$TARGET:`dirname $EXTRA`"
-	ssh "root@$TARGET" "/tmp/`basename $0` ON_TARGET $ARGS"
+	make -C "$(dirname "$0")" "$(basename $EXTRA)"
+	scp "$0" "$(dirname "$0")/$(basename $EXTRA)" "root@$TARGET:$(dirname $EXTRA)"
+	# shellcheck disable=SC2029
+	ssh "root@$TARGET" "/tmp/$(basename "$0") ON_TARGET $ARGS"
 	exit 0
 fi
 
@@ -119,8 +120,8 @@ if [ -f /tmp/domjudge-domserver_*.deb ]; then
 else
 	USEVERSION="${DJDEBVERSION:+=$DJDEBVERSION}"
 	apt-get install -q -y \
-	        domjudge-domserver${USEVERSION} domjudge-doc${USEVERSION} \
-	        domjudge-judgehost${USEVERSION}
+	        domjudge-domserver"${USEVERSION}" domjudge-doc"${USEVERSION}" \
+	        domjudge-judgehost"${USEVERSION}"
 fi
 
 # Overwrite init script to fix start/restart:
@@ -176,10 +177,10 @@ rm -f /etc/ssh/ssh_host_*
 # Replace /etc/issue with live image specifics:
 mv /etc/issue /etc/issue.orig
 cat > /etc/issue.djlive <<EOF
-DOMjudge-live running on `cat /etc/issue.orig`
+DOMjudge-live running on $(cat /etc/issue.orig)
 
-DOMjudge-live image generated on `date`
-DOMjudge Debian package version `dpkg -s domjudge-common | sed -n 's/^Version: //p'`
+DOMjudge-live image generated on $(date)
+DOMjudge Debian package version $(dpkg -s domjudge-common | sed -n 's/^Version: //p')
 
 EOF
 cp /etc/issue.djlive /etc/issue.djlive-default-passwords

live-image/prepare-for-install.sh

@@ -9,12 +9,12 @@ set -e
 
 IMG=$1
 
-if [ "`id -un`" != 'root' -o -z "$IMG" -o ! -e "$IMG" ]; then
+if [ "$(id -un)" != 'root' ] || [ -z "$IMG" ] || [ ! -e "$IMG" ]; then
 	echo "Error: this script must be run as root with argument a disk image."
 	exit 1
 fi
 
-ROOTPART=`kpartx -asv "$IMG" | tail -n1 | sed -r 's/^(add map *)?([^ ]*).*/\2/'`
+ROOTPART=$(kpartx -asv "$IMG" | tail -n1 | sed -r 's/^(add map *)?([^ ]*).*/\2/')
 ROOTPART="/dev/mapper/$ROOTPART"
 
 e2fsck -f "$ROOTPART"