From 8446a206e46ebb40fdf2505bee9e1f37cb0aa374 Mon Sep 17 00:00:00 2001 From: uprightbass360 Date: Tue, 28 Oct 2025 18:55:46 -0400 Subject: [PATCH] fix: formatting --- deploy.sh | 22 ++++++++++++++++++---- scripts/manage-modules.sh | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/deploy.sh b/deploy.sh index bc631f0..9f3bc99 100755 --- a/deploy.sh +++ b/deploy.sh @@ -117,10 +117,24 @@ resolve_project_name(){ echo "$sanitized" } +filter_empty_lines(){ + awk ' + /^[[:space:]]*$/ { + empty_count++ + if (empty_count <= 1) print + } + /[^[:space:]]/ { + empty_count = 0 + print + } + ' +} + compose(){ local project_name project_name="$(resolve_project_name)" - docker compose --project-name "$project_name" -f "$COMPOSE_FILE" "$@" + # Add --quiet for less verbose output, filter excessive empty lines + docker compose --project-name "$project_name" -f "$COMPOSE_FILE" "$@" | filter_empty_lines } # Build detection logic @@ -231,7 +245,7 @@ prompt_build_if_needed(){ if [ -t 0 ]; then local reply - read -r -p "Run './build.sh' now? [y/N]: " reply + read -r -p "Run build now? [y/N]: " reply reply="${reply:-n}" case "$reply" in [Yy]*) @@ -244,12 +258,12 @@ prompt_build_if_needed(){ fi ;; *) - err "Build required but declined. Run './build.sh' manually before deploying." + err "Build required but declined. Run './build.sh' manually before deploying or re-run this script." return 1 ;; esac else - err "Build required but running non-interactively. Run './build.sh' first." + err "Build required but running non-interactively. Run './build.sh' manually before deploying or re-run this script." return 1 fi } diff --git a/scripts/manage-modules.sh b/scripts/manage-modules.sh index 0cf964c..03ddffd 100755 --- a/scripts/manage-modules.sh +++ b/scripts/manage-modules.sh @@ -701,6 +701,8 @@ elif [ -f "/tmp/scripts/manage-modules-sql.sh" ]; then . /tmp/scripts/manage-modules-sql.sh else echo "⚠️ SQL helper not found, skipping module SQL execution" + echo "If you are seeing this during build this is normal" + fi # Execute SQLs for enabled modules (via helper) @@ -826,7 +828,7 @@ echo 'Module management complete.' if [ "$MODULES_LOCAL_RUN" = "1" ]; then # When running locally, use local-storage for build state tracking - local local_storage_path="${LOCAL_STORAGE_SENTINEL_PATH:-}" + local_storage_path="${LOCAL_STORAGE_SENTINEL_PATH:-}" if [ -n "$local_storage_path" ]; then REBUILD_SENTINEL="$local_storage_path" else