Merge branch 'fix-find'

* fix-find:
  Fix solve_day.sh for mac
  Fix bash issues
  Get rid of bc(1) as not included in devcontainer image
  Fix for backfill script
  stats.sh: work for both GNU and BSD find

Author: erikw

bin/aoc_lib.sh

@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
 # Shared helpers for AoC scripts.
 
+
+# Remove leading zeroes from a number
+# The 10# prefix tells bash to treat the number as base-10, which automatically removes leading zeroes.
+__aoc_strip_leading_zeroes() {
+	local num="$1"
+	echo $((10#$num))
+}
+
 # Initialize a main script for AoC.
 aoc_init_script() {
 	aoc_cd_git_root
@@ -30,6 +38,11 @@ aoc_parse_year() {
 	year=$(date +%Y)
 	if [ $# -eq 1 ]; then
 		IFS="/" read -ra ym <<< "$date"
+		if (( ${#ym[@]} != 2 )); then
+			echo "Could not parse year." >&2
+			exit 7
+		fi
+
 		year=${ym[0]}
 		test ${#year} -eq 4 || year="20$year"
 	elif [ "$(date +%m)" != 12 ]; then
@@ -46,6 +59,10 @@ aoc_parse_day() {
 	day=$(date +%d)
 	if [ $# -eq 1 ]; then
 		IFS="/" read -ra ym <<< "$date"
+		if (( ${#ym[@]} != 2 )); then
+			echo "Could not parse date." >&2
+			exit 9
+		fi
 		day=${ym[1]}
 		test ${#day} -eq 2 || day="0$day"
 	elif [ "$(date +%m)" != 12 ]; then
@@ -60,7 +77,7 @@ aoc_fetch_input() {
 	local year day0 day url_fmt url
 	year="$1"
 	day0="$2"
-	day=$(echo "$day0" | bc)
+	day=$(__aoc_strip_leading_zeroes "$day0")
 
 	url_fmt="https://adventofcode.com/%d/day/%d/input"
 	# shellcheck disable=SC2059
@@ -82,7 +99,7 @@ aoc_create_readme() {
 	local year day0 day url_base url
 	year="$1"
 	day0="$2"
-	day=$(echo "$day0" | bc)
+	day=$(__aoc_strip_leading_zeroes "$day0")
 
 	url_base="adventofcode.com/${year}/day/${day}"
 	url="https://${url_base}"
@@ -112,7 +129,7 @@ aoc_create_instructions_url() {
 	local year day0 day url
 	year="$1"
 	day0="$2"
-	day=$(echo "$day0" | bc)
+	day=$(__aoc_strip_leading_zeroes "$day0")
 
 	url="https://adventofcode.com/${year}/day/${day}"
 
@@ -131,7 +148,7 @@ aoc_create_input_script() {
 	local year day0 day url
 	year="$1"
 	day0="$2"
-	day=$(echo "$day0" | bc)
+	day=$(__aoc_strip_leading_zeroes "$day0")
 
 	url="https://adventofcode.com/${year}/day/${day}/input"
 
@@ -170,4 +187,4 @@ aoc_create_enter() {
 	local path="$year/$day"
 	mkdir -p "$path"
 	cd "$path" || exit 6
-}
+}

bin/backfill_days.sh

@@ -30,7 +30,8 @@ backfill_day() {
 
 
 backfill_days_all() {
-	paths=$(find . -maxdepth 2 -type d -regex "\./*[0-9]+/[0-9]+" | sort | sed -e 's|./||')
+	# Regex written to work for both GNU/BSD find meaning e.g. `+` quantifier can't be used.
+	paths=$(find . -maxdepth 2 -type d -regex '\./20[0-9][0-9]/[0-9][0-9]*' | sort | sed -e 's|./||')
 	for path in $paths; do
 		cd "$path" || exit
 

bin/solve_day.sh

@@ -56,7 +56,7 @@ enter_day() {
 
 	local files=(input1.0 output1.0 output2.0)
 	files+=("part1.${arg_lang}")
-	if "$day" != 25; then
+	if [ "$day" != 25 ]; then
 		files+=("part2.${arg_lang}")
 	fi
 
@@ -94,7 +94,7 @@ day=$(aoc_parse_day "$@") || exit
 enter_day "$year" "$day" "$arg_lang"
 
 
-if [ "$CODESPACES" = true ]; then
+if [ "${CODESPACES:-}" = true ]; then
 	test "$day" == 25 && p2="" || p2="output2.0 part2.${arg_lang}"
 
 	code part1."${arg_lang}" input1.0 output1.0 input "$p2"
@@ -115,4 +115,4 @@ aoc_cd_git_root # Get back again, to run git commands etc.
 "$SCRIPT_DIR"/stats.sh
 git status
 path="${year}/${day}"
-printf "\n\ngit add %s && git commit -m \"Add %s %s\" && git fetch && git rebase && git push && tig\n" "$path" "$path" "$arg_lang"
+printf "\n\ngit add %s && git commit -m \"Add %s %s\" && git fetch && git rebase && git push && tig\n" "$path" "$path" "$arg_lang"

bin/stats.sh

@@ -39,10 +39,11 @@ nbr_solved() {
 	local path="./${1:-}" # Unify so that path always starts with ./, so cut below works.
 
 	# sort -u: account for the fact that a puzzle part can be solved in multiple languages.
-	stars=$(find "$path" -regex '.*/part[12]\.\w+$' -print | cut -d. -f2 | sort -u | wc -l)
+	# Regex written to work for both GNU/BSD find meaning e.g. `+` quantifier can't be used.
+	stars=$(find "$path" -iregex '.*/part[12]\.[a-z][a-z]*$' -print | cut -d. -f2 | sort -u | wc -l)
 
 	# Day 25 only as part1, part2 for free.
-	stars_d25=$(find "$path" -regex '.*/25/part1\.\w+$' | cut -d. -f2 | sort -u | wc -l)
+	stars_d25=$(find "$path" -iregex '.*/25/part1\.[a-z][a-z]*$' | cut -d. -f2 | sort -u | wc -l)
 	((stars+=stars_d25))
 
 	echo "$stars"
@@ -61,4 +62,4 @@ for year in $years; do
 	printf "%s: %s\n" "$year" "$solved"
 done
 printf "===========\n"
-printf "Total: ${ESC_BOLD}%d${ESC_REST}\n" "$(nbr_solved)"
+printf "Total: ${ESC_BOLD}%d${ESC_REST}\n" "$(nbr_solved)"