Add gh/tea to the CLI wizard, drop the JetBrains module from all templates
Provision Coder Templates / provision (push) Successful in 2m7s
Provision Coder Templates / provision (push) Successful in 2m7s
- cli-setup-wizard.sh (identical across all 6 templates): add GitHub CLI (gh, installed via the official apt repo) and Gitea CLI (tea, official binary release to ~/.local/bin) as two more opt-in install-then-login prompts, alongside the existing Copilot/Antigravity/Claude Code CLI entries. Same pattern: skip if already installed, ask before installing, attempt login, never hard-fail the wizard. - main.tf (all 6 templates): remove the `module "jetbrains"` block - not used, dropped per request. - README.md: update the "Layout" blurb and CLI setup wizard tool list to match.
This commit is contained in:
@@ -96,6 +96,47 @@ else
|
||||
echo "Skipping Claude Code CLI: bun not found on this workspace image."
|
||||
fi
|
||||
|
||||
# --- GitHub CLI (gh) ---
|
||||
if command -v gh >/dev/null 2>&1; then
|
||||
echo "GitHub CLI already installed, skipping."
|
||||
else
|
||||
if ask_yes_no "Install GitHub CLI (gh) and log in?"; then
|
||||
if (sudo mkdir -p -m 755 /etc/apt/keyrings \
|
||||
&& curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg >/dev/null \
|
||||
&& sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
|
||||
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list >/dev/null \
|
||||
&& sudo apt-get update -qq && sudo apt-get install -y gh); then
|
||||
gh auth login || echo "Install succeeded but login didn't complete. Retry any time with: gh auth login"
|
||||
else
|
||||
echo "GitHub CLI install failed. Retry later with: gh auth login (once gh is installed)"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# --- Gitea CLI (tea) ---
|
||||
if command -v tea >/dev/null 2>&1; then
|
||||
echo "Gitea CLI already installed, skipping."
|
||||
else
|
||||
if ask_yes_no "Install Gitea CLI (tea) and log in?"; then
|
||||
TEA_ARCH="$(uname -m)"
|
||||
case "$TEA_ARCH" in
|
||||
x86_64) TEA_ARCH="amd64" ;;
|
||||
aarch64) TEA_ARCH="arm64" ;;
|
||||
esac
|
||||
TEA_VERSION="$(curl -fsSL https://gitea.com/api/v1/repos/gitea/tea/releases/latest | grep -o '"tag_name":[^,]*' | grep -o 'v[0-9][^"]*')"
|
||||
mkdir -p "$HOME/.local/bin"
|
||||
if [ -n "$TEA_VERSION" ] \
|
||||
&& curl -fsSL "https://gitea.com/gitea/tea/releases/download/${TEA_VERSION}/tea-${TEA_VERSION#v}-linux-${TEA_ARCH}" -o "$HOME/.local/bin/tea" \
|
||||
&& chmod +x "$HOME/.local/bin/tea"; then
|
||||
echo "Add this Gitea instance now (e.g. https://git.octoturge.com)..."
|
||||
tea login add || echo "Login didn't complete. Retry any time with: tea login add"
|
||||
else
|
||||
echo "Gitea CLI install failed. Retry later from: https://gitea.com/gitea/tea/releases"
|
||||
rm -f "$HOME/.local/bin/tea"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
echo ""
|
||||
if ask_yes_no "Mark setup wizard as complete so it stops asking on new terminals?"; then
|
||||
touch "$WIZARD_DONE_FILE"
|
||||
|
||||
Reference in New Issue
Block a user