From 33df39f430de5c8e43f9b61081560f69b59dfdd9 Mon Sep 17 00:00:00 2001 From: uprightbass360 Date: Sat, 25 Oct 2025 19:54:57 -0400 Subject: [PATCH] Allow blank defaults in get_template_value --- setup.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/setup.sh b/setup.sh index 20a993a..882e11f 100755 --- a/setup.sh +++ b/setup.sh @@ -26,18 +26,19 @@ get_template_value() { # Extract value, handling variable expansion syntax like ${VAR:-default} local value - value=$(grep "^${key}=" "$template_file" | head -1 | cut -d'=' -f2- | sed 's/^"\(.*\)"$/\1/') + local raw_line + raw_line=$(grep "^${key}=" "$template_file" | head -1) + if [ -z "$raw_line" ]; then + echo "ERROR: Required key '$key' not found in .env.template" >&2 + exit 1 + fi + value="${raw_line#*=}" + value=$(echo "$value" | sed 's/^"\(.*\)"$/\1/') # Handle ${VAR:-default} syntax by extracting the default value if [[ "$value" =~ ^\$\{[^}]*:-([^}]*)\}$ ]]; then value="${BASH_REMATCH[1]}" fi - - if [ -z "$value" ]; then - echo "ERROR: Required key '$key' not found in .env.template" >&2 - exit 1 - fi - echo "$value" }