From c37816736b20d42875a24c3cf4f84f49bcec6057 Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Tue, 21 Apr 2026 19:10:25 -0700 Subject: [PATCH] sync: auto-sync from DESKTOP-0O8A1RL at 2026-04-21 19:10:13 Author: Mike Swanson Machine: DESKTOP-0O8A1RL Timestamp: 2026-04-21 19:10:13 --- .claude/scripts/sync.sh | 8 ++++++-- .claude/skills/remediation-tool/scripts/get-token.sh | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.claude/scripts/sync.sh b/.claude/scripts/sync.sh index c47b69f..08d3e9a 100755 --- a/.claude/scripts/sync.sh +++ b/.claude/scripts/sync.sh @@ -86,8 +86,12 @@ Author: $USER_DISPLAY Machine: $MACHINE Timestamp: $TIMESTAMP" - git commit -m "$COMMIT_MSG" - echo -e "${GREEN}[OK]${NC} Committed." + if git diff-index --quiet --cached HEAD -- 2>/dev/null; then + echo -e "${GREEN}[OK]${NC} No stageable changes (submodule internal changes skipped)." + else + git commit -m "$COMMIT_MSG" + echo -e "${GREEN}[OK]${NC} Committed." + fi else echo -e "${GREEN}[OK]${NC} No local changes to commit." fi diff --git a/.claude/skills/remediation-tool/scripts/get-token.sh b/.claude/skills/remediation-tool/scripts/get-token.sh index acf00a3..f4214a6 100755 --- a/.claude/skills/remediation-tool/scripts/get-token.sh +++ b/.claude/skills/remediation-tool/scripts/get-token.sh @@ -87,7 +87,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" CLAUDETOOLS_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)" IDENTITY_FILE="$CLAUDETOOLS_ROOT/.claude/identity.json" -VAULT_ROOT="${VAULT_PATH:-}" +VAULT_ROOT="${VAULT_ROOT_ENV:-}" if [[ -z "$VAULT_ROOT" && -f "$IDENTITY_FILE" ]]; then for py in py python3 python; do if command -v "$py" >/dev/null 2>&1; then @@ -95,7 +95,7 @@ if [[ -z "$VAULT_ROOT" && -f "$IDENTITY_FILE" ]]; then fi done fi -[[ -z "$VAULT_ROOT" ]] && { echo "ERROR: vault_path not set in $IDENTITY_FILE and VAULT_PATH env var not set" >&2; exit 3; } +[[ -z "$VAULT_ROOT" ]] && { echo "ERROR: vault_path not set in $IDENTITY_FILE and VAULT_ROOT_ENV env var not set" >&2; exit 3; } [[ ! -d "$VAULT_ROOT" ]] && { echo "ERROR: vault not found at $VAULT_ROOT (check vault_path in $IDENTITY_FILE)" >&2; exit 3; } SOPS_FILE="$VAULT_ROOT/$VAULT_PATH"