From e6565d9d4f508fe4cfdd7041ccb77e9a3ab477cb Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:04:28 -0800
Subject: [PATCH] Fix scripts in 2020/ferguson1 for shellcheck

---
 2020/ferguson1/play.sh          |  8 ++++----
 2020/ferguson1/snake-colours.sh | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/2020/ferguson1/play.sh b/2020/ferguson1/play.sh
index ac153dc15..6d02b0466 100755
--- a/2020/ferguson1/play.sh
+++ b/2020/ferguson1/play.sh
@@ -51,8 +51,8 @@ DFLT[2]="-DHEAD=COLOR_RED"	# Head foreground: red	    (HEAD)
 DFLT[3]="-DHB=COLOR_BLACK"	# Head background: black    (HB)
 DFLT[4]="-DBODY=COLOR_GREEN"	# Body foreground: green    (BODY)
 DFLT[5]="-DBS=COLOR_BLACK"	# Body background: black    (BS)
-DFLT[6]="-DBG=COLOR_WHITE"	#  Bug foreground: white    (BG)
-DFLT[7]="-DBB=COLOR_BLACK"	#  Bug background: black    (BB)
+DFLT[6]="-DBG=COLOR_WHITE"	# Bug foreground: white    (BG)
+DFLT[7]="-DBB=COLOR_BLACK"	# Bug background: black    (BB)
 COLOURS[0]="-DWALL=COLOR_"
 COLOURS[1]="-DWB=COLOR_"
 COLOURS[2]="-DHEAD=COLOR_"
@@ -86,9 +86,9 @@ function configure_colours()
 	show_colours "${i}"
 	x="${?}"
 	if [[ "${x}" != 255 ]]; then
-	    COLOURS[$j]="${COLOURS[$j]}${COLOUR[$x]}"
+	    COLOURS[j]="${COLOURS[$j]}${COLOUR[$x]}"
 	else
-	    COLOURS[$j]=${DFLT[$j]}
+	    COLOURS[j]=${DFLT[$j]}
 	fi
 	j=$j+1
     done
diff --git a/2020/ferguson1/snake-colours.sh b/2020/ferguson1/snake-colours.sh
index d7404d9d9..2c5286852 100755
--- a/2020/ferguson1/snake-colours.sh
+++ b/2020/ferguson1/snake-colours.sh
@@ -78,26 +78,26 @@ function configure_colours()
     for i in "WALL" "WALL (BACKGROUND)" "HEAD" "HEAD (BACKGROUND)" "BODY" "BODY (BACKGROUND)" "BUG" "BUG (BACKGROUND)"; do
 	show_colours "${i}"
 	x="${?}"
-	if [ "${x}" != 255 ]; then
-	    COLOURS[$j]="${COLOURS[$j]}${COLOUR[$x]}"
+	if [[ "${x}" != 255 ]]; then
+	    COLOURS[j]="${COLOURS[$j]}${COLOUR[$x]}"
 	else
-	    COLOURS[$j]=${DFLT[$j]}
+	    COLOURS[j]=${DFLT[$j]}
 	fi
 	j=$j+1
     done
 
-    echo cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' ${COLOURS[0]} ${COLOURS[1]} \
-	${COLOURS[2]} ${COLOURS[3]} ${COLOURS[4]} ${COLOURS[5]} ${COLOURS[6]} ${COLOURS[7]} -lncurses
+    echo cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' "${COLOURS[0]}" "${COLOURS[1]}" \
+	"${COLOURS[2]}" "${COLOURS[3]}" "${COLOURS[4]}" "${COLOURS[5]}" "${COLOURS[6]}" "${COLOURS[7]}" -lncurses
 
-    cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' ${COLOURS[0]} ${COLOURS[1]} \
-	${COLOURS[2]} ${COLOURS[3]} ${COLOURS[4]} ${COLOURS[5]} ${COLOURS[6]} ${COLOURS[7]} -lncurses || exit 1
+    cc -o prog.alt prog.alt.c -D'f(a,b)'='((a)<(b)?(a):(b))' "${COLOURS[0]}" "${COLOURS[1]}" \
+	"${COLOURS[2]}" "${COLOURS[3]}" "${COLOURS[4]}" "${COLOURS[5]}" "${COLOURS[6]}" "${COLOURS[7]}" -lncurses || exit 1
 }
 
 make
 
 ./termcaps
 T="${?}"
-if [ "${T}" -ne 0 ]; then
+if [[ "${T}" -ne 0 ]]; then
     read -rp  "Terminal issues detected; do you wish to continue anyway (Y/N) ? " ans
     [[ "${ans}" != "y" ]] && [[ "${ans}" != "Y" ]] && exit 1
 fi