2021: Shellcheck fixes and cleanup

einarjon · einarjon · commit 9410a802cdd8 · 2024-03-07T15:24:59.000Z
Minor cleanup in 4, 7 and 9-12
diff --git a/2021/01.sh b/2021/01.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 A=($(< "${1:-1.txt}")); a=${A[0]}; ANS=0
 for b in "${A[@]:1}"; do ((b>a && ++ANS)); a=$b; done
 echo "1A: ${ANS}"
diff --git a/2021/02.sh b/2021/02.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 input=${1:-2.txt}
 declare -i X=0 Y=0 y=0
 while read -r dir n; do
diff --git a/2021/03.sh b/2021/03.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 nextchar() {
     local -n most=$1 least=$2 in=$3
     local all; all=$(printf "%s\n" "${in[@]}" | cut -c"$4" | tr -d '\n' )
diff --git a/2021/04.sh b/2021/04.sh
@@ -1,12 +1,11 @@
-#! /usr/bin/env bash
-declare -i i
+#!/usr/bin/env bash
+declare -i i j=0
 while read -r a b c d e; do
     if (( ${#NUMBERS[@]} == 0 )); then NUMBERS=(${a//,/ });
     elif [[ -n $a ]]; then
         C[i++]="-$a--$b--$c--$d--$e-" # rows
-        j=$((10*(i/10))) # columns
         C[j+5]+="-$a-";C[j+6]+="-$b-";C[j+7]+="-$c-";C[j+8]+="-$d-";C[j+9]+="-$e-";
-        ((i%5==0)) && i+=5
+        ((i%5==0)) && i+=5 j+=10
     fi
 done < "${1:-4.txt}"
 idx=(${!C[@]})
@@ -17,16 +16,15 @@ for k in "${!NUMBERS[@]}"; do
     (( ${#B[@]} != ${#C[@]} )) && break
 done
 for i in "${idx[@]}"; do [[ -z ${C[i]} ]] && break; done
-j=$((10*(i/10))) # columns
+j=$((10*(i/10))) # card number
 printf -v sum "%s" "${C[@]:j:5}"
 sum=${sum//--/+}; sum=${sum//-}
-echo "12A: $((n*(sum)))"
+echo "12A: $((n*sum))"
 
 printf -v WON "=%d=" {0..990..10}
 WON=${WON/=$j=} # only do each card once
 for i in "${idx[@]:j:10}"; do C[i]=DONE; done
-for k in "${!NUMBERS[@]}"; do
-    n=${NUMBERS[k]}
+for n in "${NUMBERS[@]:k+1}"; do
     C=("${C[@]//-$n-}")
     B=(${C[@]})
     if (( ${#B[@]} != ${#C[@]} )); then
@@ -41,4 +39,4 @@ for k in "${!NUMBERS[@]}"; do
 done
 printf -v sum "%s" "${C[@]:j:5}"
 sum=${sum//--/+}; sum=${sum//-}
-echo "12B: $((n*(sum)))"
+echo "12B: $((n*sum))"
diff --git a/2021/07.sh b/2021/07.sh
@@ -1,14 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 input=$(< "${1:-7.txt}")
 A=($(echo -e "${input//,/\\n}" | sort -n))
-N=${#A[@]}
-avg=$(((${input//,/+})/N))
-n=""; for k in "${A[@]}";do n+=+$((k-A[N/2])); done
-sum=$((${n//-})) # lazy abs()
-echo "7A: $sum"
-declare -i sum2=0
+N=${#A[@]} n=""
+declare -i avg=$(((${input//,/+})/N)) sum2=0
 for k in "${A[@]}"; do
+    n+=+$((k-A[N/2]));
     dist=$((k-avg)); dist=${dist/-}
     sum2+=$((dist*(dist+1)/2))
 done
+sum=${n//-} # lazy abs()
+echo "7A: $((sum))"
 echo "7B: $sum2"
diff --git a/2021/08.sh b/2021/08.sh
@@ -23,7 +23,7 @@ while read -r -a A; do
             6,??,*)   n+=9;;
             6,*)      n+=0;;
             7,*)      n+=8;;
-            *) echo ERROR: ${#i},${i//[$T4]},${i//[$T7]}; break 2;;
+            *) echo "ERROR: ${#i},${i//[$T4]},${i//[$T7]}"; break 2;;
         esac
     done
     sum+=+$((10#$n))
diff --git a/2021/09.sh b/2021/09.sh
@@ -1,6 +1,6 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 A=($(< "${1:-9.txt}"))
-B=(9${A//?/9}9); for i in "${A[@]}"; do B+=(9${i}9); done; B+=($B); C=("${B[@]}");
+B=(9${A//?/9}9); for i in "${A[@]}"; do B+=(9${i}9); done; B+=(${B[0]}); C=("${B[@]}");
 n=${#A} N=${#A[@]}
 declare -A LOWS
 for ((y=1; y<=N; ++y)); do
@@ -17,7 +17,7 @@ printf -v sum "+%s" "${LOWS[@]}"
 echo "9A: $((sum + ${#LOWS[@]}))"
 
 C=(${C[@]//[0-8]/-}) c=0
-F=({a..z} {A..Z} {0..8} + _ / =)
+F=({a..z} {A..Z} {0..8} + _ / "=")
 idx=($(printf "%s\n" "${!LOWS[@]}" | sort -n))
 for i in "${idx[@]}"; do
     LOWS[$i]=${F[c]}
@@ -38,10 +38,10 @@ for i in {1..6}; do
 done
 while [[ "${C[*]}" == *-* ]]; do
     #echo "round $((++round))"
-    for y in ${!C[@]}; do
+    for y in "${!C[@]}"; do
         [[ ${C[y]} != *-* ]] && continue
-        minus=($(sed "s/./&\n/g" <<< ${C[y]:1} | grep -n '-'))
-        for x in ${minus[@]//:*}; do
+        minus=($(sed "s/./&\n/g" <<< "${C[y]:1}" | grep -n '-'))
+        for x in "${minus[@]//:*}"; do
             for j in 1 -1; do
                 k=$j
                 while [[ ${C[y+k]:x:1} == - ]]; do ((k+=j)); done
@@ -60,10 +60,10 @@ while [[ "${C[*]}" == *-* ]]; do
 done
 
 AREA=()
-for i in ${F[@]}; do
+for i in "${F[@]}"; do
     while read -r A;do
         AREA+=(${#A}:$A)
-    done < <(printf "%s\n" "${C[@]}" | grep -a1 $i | tr -cd "$i-" | tr -s '-' '\n')
+    done < <(printf "%s\n" "${C[@]}" | grep -a1 "$i" | tr -cd "$i-" | tr -s '-' '\n')
 done
 BIG=($(printf "%s\n" "${AREA[@]//:*}" | sort -nr))
 echo "9B: $((BIG[0]*BIG[1]*BIG[2]))"
diff --git a/2021/10.sh b/2021/10.sh
@@ -2,16 +2,18 @@
 A=($(tr '()[]{}<>' '1a2b3c4d' < "${1:-10.txt}"))
 while [[ ${A[*]} =~ (1a|2b|3c|4d) ]]; do
     A=(${A[@]//1a}); A=(${A[@]//2b}); A=(${A[@]//3c}); A=(${A[@]//4d})
+    echo $((++i))
 done
+# P1 only contains closing brackets. P2 only contains lines with no closing brackets
 # shellcheck disable=SC2034
-a=3 b=57 c=1197 d=25137 TMP=(${A[@]//[1234]}) C=()
-printf -v sum "+%.1s" "${TMP[@]}" # TMP only contains closing brackets. Print first char
+a=3 b=57 c=1197 d=25137 P1=(${A[@]//[1234]}) P2=(${A[@]/*[^1234]*}) C=()
+printf -v sum "+%.1s" "${P1[@]}" # Only print first char
 echo "10A: $((sum))"
 while read -r -a B; do
     sum=0
     for i in "${B[@]}"; do sum=$((sum*5+i)); done
     C+=($sum)
-done < <( printf "%s\n" "${A[@]}" | grep -v -E '[a-d]' | rev | sed 's/./ &/g')
+done < <(printf "%s\n" "${P2[@]}" | rev | sed 's/./ &/g')
 C=($(printf "%s\n" "${C[@]}" | sort -n ))
 N=${#C[@]}
 echo "10B: ${C[N/2]}"
diff --git a/2021/11.sh b/2021/11.sh
@@ -1,22 +1,23 @@
 #!/usr/bin/env bash
 
 A=($(sed -e 's/^/X/;s/./& /g'  "${1:-11.txt}"))
-Zeros=${A[*]//*/0} flashes=0 last=0 idx=(${!A[@]})
+flashes=0 last=0 idx=(${!A[@]})
 A+=(X X X X X X X X X X X X)
 A=(${A[@]//X/-999999999})
 flash(){
     local n=$1 j cur
     ((++flashes))
+    # hardcoded neighbours. There's an X on one side, so Y-offset is cols+1
     for j in -12 -11 -10 -1 1 10 11 12; do
         cur=$((n+j))
-        ((++A[cur] >= 10 && F[cur]++ == 0 )) && flash $cur
+        ((++A[cur] >= 10 && FLASHED[cur]++ == 0 )) && flash $cur
     done
 }
 round(){
-    F=(${Zeros})
-    for i in ${idx[@]}; do ((++A[i] >= 10 && F[i]++ == 0)) && flash $i ; done
-    A=(${A[@]//1?/0})
+    FLASHED=()
+    for i in "${idx[@]}"; do ((++A[i] >= 10 && FLASHED[i]++ == 0)) && flash "$i"; done
     #A=(${A[@]//-99??/-9999})
+    A=(${A[@]//1?/0})
 }
 for rounds in {1..100}; do
     round
diff --git a/2021/12.sh b/2021/12.sh
@@ -1,27 +1,28 @@
 #!/usr/bin/env bash
-declare -A Next=()
+declare -A Next=() BIG=()
 IFS=$' -\n'
 while read -r a b; do
     [[ $a != start ]] && Next[$b]+="$a "
     [[ $b != start ]] && Next[$a]+="$b "
 done < "${1:-12.txt}"
+for i in "${!Next[@]}"; do [[ -z ${i//[A-Z]} ]] && BIG[$i]=1; done
 #for i in "${!Next[@]}"; do echo "$i: '${Next[$i]}'"; done
 
 r() {
-    local route=$1 cur=$2 visited=$3 k deeper=false
+    local route=$1 cur=$2 visited=$3 k
     if [[ $cur == end ]]; then
-        PATHS+=("$route:$cur")
-    elif [[ $cur != "${cur,,}" || $route != *:${cur}:*
-        || ($cur == "${cur,,}" && $((visited++)) == 0) ]]; then
+        PATHS+=1
+    elif [[ -n ${BIG[$cur]} || $route != *:${cur}:* ]] \
+        || ((visited++ == 0)); then
         for k in ${Next[$cur]}; do
             r "$route:$cur" "$k" $visited
         done
     fi
 }
 
-PATHS=()
+declare -i PATHS=0
 r "" start 1
-echo "12A: ${#PATHS[@]}"
-PATHS=()
+echo "12A: ${PATHS}"
+PATHS=0
 r "" start 0
-echo "12B: ${#PATHS[@]}"
+echo "12B: ${PATHS}"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#! /usr/bin/env bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`A=($(< "${1:-1.txt}")); a=${A[0]}; ANS=0`
`3`	`3`	`for b in "${A[@]:1}"; do ((b>a && ++ANS)); a=$b; done`
`4`	`4`	`echo "1A: ${ANS}"`