From 197396c5fe7b5f80206ffc4e77eb1fc5f2466b37 Mon Sep 17 00:00:00 2001 From: bookworm Date: Mon, 6 Apr 2026 22:19:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20macOS=20=E8=A1=A5=E5=85=A8=20{{PWSH=5FPA?= =?UTF-8?q?TH}}=20=E6=B8=B2=E6=9F=93=20+=20GEMINI=5FAPI=5FKEY=20Keychain?= =?UTF-8?q?=20=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - settings.template.json 渲染补加 {{PWSH_PATH}} → $SHELL (默认 /bin/zsh) 避免 settings.json 留有字面量 "SHELL":"{{PWSH_PATH}}" - save_secrets_to_cache 增加 GEMINI_API_KEY，与 Windows 版本对齐 Co-Authored-By: Claude Opus 4.6 (1M context) --- Bookworm-Setup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Bookworm-Setup.sh b/Bookworm-Setup.sh index fc2e2a1..c47d457 100644 --- a/Bookworm-Setup.sh +++ b/Bookworm-Setup.sh @@ -248,7 +248,7 @@ save_secrets_to_cache() { local today today=$(date +%Y-%m-%d) local data="EXPIRY=$today" - local env_keys="ANTHROPIC_API_KEY ANTHROPIC_BASE_URL GITHUB_PERSONAL_ACCESS_TOKEN SLACK_BOT_TOKEN ATLASSIAN_API_TOKEN BROWSERBASE_API_KEY FIRECRAWL_API_KEY" + local env_keys="ANTHROPIC_API_KEY ANTHROPIC_BASE_URL GITHUB_PERSONAL_ACCESS_TOKEN SLACK_BOT_TOKEN ATLASSIAN_API_TOKEN BROWSERBASE_API_KEY FIRECRAWL_API_KEY GEMINI_API_KEY" for k in $env_keys; do local v="${!k}" if [ -n "$v" ]; then @@ -326,8 +326,9 @@ TEMPLATE_FILE="$CLAUDE_DIR/settings.template.json" SETTINGS_FILE="$CLAUDE_DIR/settings.json" if [ -f "$TEMPLATE_FILE" ]; then CLAUDE_ROOT=$(echo "$CLAUDE_DIR" | sed 's/\\/\//g') - sed "s|{{CLAUDE_ROOT}}|$CLAUDE_ROOT|g; s|{{HOME}}|$HOME|g" "$TEMPLATE_FILE" > "$SETTINGS_FILE" - success "settings.json 已渲染" + SHELL_BIN="${SHELL:-/bin/zsh}" + sed "s|{{CLAUDE_ROOT}}|$CLAUDE_ROOT|g; s|{{HOME}}|$HOME|g; s|{{PWSH_PATH}}|$SHELL_BIN|g" "$TEMPLATE_FILE" > "$SETTINGS_FILE" + success "settings.json 已渲染 (SHELL=$SHELL_BIN)" fi # ============================================================