From e40fd485470ac6157f53fcda4e5373af576036d4 Mon Sep 17 00:00:00 2001 From: Fizzlepoof Date: Tue, 12 May 2026 08:22:40 -0500 Subject: [PATCH] fix: sync-envs-to-secrets depth 3, fix ((copied++)) set -e bug --- scripts/sync-envs-to-secrets.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/sync-envs-to-secrets.sh b/scripts/sync-envs-to-secrets.sh index d9deeb2..98a3cc8 100644 --- a/scripts/sync-envs-to-secrets.sh +++ b/scripts/sync-envs-to-secrets.sh @@ -26,26 +26,27 @@ copied=0 skipped=0 while IFS= read -r -d '' envfile; do - # Derive stack name from parent directory - stack=$(basename "$(dirname "$envfile")") + # Derive stack name: use "parent-child" for nested dirs (e.g. media/kima-hub → media-kima-hub) + relpath="${envfile#${COMPOSE_ROOT}/}" # e.g. media/kima-hub/.env + stackpath="${relpath%/.env}" # e.g. media/kima-hub + stack="${stackpath//\//-}" # e.g. media-kima-hub dest="${ENV_DIR}/${stack}.env" if [[ -f "$dest" ]]; then - # Only overwrite if source is newer or different if ! diff -q "$envfile" "$dest" &>/dev/null; then cp "$envfile" "$dest" info "Updated: ${stack}.env" - ((copied++)) + copied=$((copied + 1)) else warn "Unchanged: ${stack}.env — skipping" - ((skipped++)) + skipped=$((skipped + 1)) fi else cp "$envfile" "$dest" info "Added: ${stack}.env" - ((copied++)) + copied=$((copied + 1)) fi -done < <(find "$COMPOSE_ROOT" -maxdepth 2 -name ".env" -not -path "*/.git/*" -print0 | sort -z) +done < <(find "$COMPOSE_ROOT" -maxdepth 3 -name ".env" -not -path "*/.git/*" -print0 | sort -z) if [[ $copied -eq 0 ]]; then warn "Nothing new to commit ($skipped unchanged)."