Stevan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: use non-snap version for bw

Browse Source
This commit is contained in:
Stevan Freeborn
2026-07-07 19:51:17 -05:00
parent 69800aea62
commit 37bba6dd1f
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/bootstrap.sh
+9 -14
View File
@@ -37,21 +37,17 @@ else
fi fi
# --- Install Bitwarden CLI --- # --- Install Bitwarden CLI ---
# Ensure /snap/bin is in PATH — snap binaries aren't visible in the current
# shell session without this when running via bash <(curl ...)
command -v snap &>/dev/null && export PATH="$PATH:/snap/bin"
step "Checking Bitwarden CLI..." step "Checking Bitwarden CLI..."
if command -v bw &>/dev/null; then if BW_VERSION=$(bw --version 2>/dev/null); then
skip "bw already installed ($(bw --version))." skip "bw already installed ($BW_VERSION)."
else else
if command -v snap &>/dev/null; then # Remove broken snap installation if present
step "Installing Bitwarden CLI via snap..." if command -v snap &>/dev/null && snap list bw &>/dev/null 2>&1; then
sudo snap install bw echo " Removing broken snap installation..."
ok "bw installed via snap." sudo snap remove bw
else fi
# Fallback: download the official Linux binary from GitHub releases
step "snap not available; downloading Bitwarden CLI binary..." step "Downloading Bitwarden CLI binary..."
BW_VERSION=$(curl -fsLS "https://api.github.com/repos/bitwarden/clients/releases/latest" \ BW_VERSION=$(curl -fsLS "https://api.github.com/repos/bitwarden/clients/releases/latest" \
| grep '"tag_name"' | grep cli | head -1 | sed 's/.*"cli-v\([^"]*\)".*/\1/' || echo "") | grep '"tag_name"' | grep cli | head -1 | sed 's/.*"cli-v\([^"]*\)".*/\1/' || echo "")
if [ -z "$BW_VERSION" ]; then if [ -z "$BW_VERSION" ]; then
@@ -65,7 +61,6 @@ else
rm -f "$TMP_ZIP" rm -f "$TMP_ZIP"
ok "bw ${BW_VERSION} installed to /usr/local/bin/bw." ok "bw ${BW_VERSION} installed to /usr/local/bin/bw."
fi fi
fi
# --- Install chezmoi --- # --- Install chezmoi ---
step "Checking chezmoi..." step "Checking chezmoi..."
scripts/import-ssh-keys-to-bitwarden.sh
+2 -2
View File
@@ -7,7 +7,7 @@
# Public keys (.pub files) and non-key files (config, known_hosts) are skipped. # Public keys (.pub files) and non-key files (config, known_hosts) are skipped.
# #
# Requires: # Requires:
# - Bitwarden CLI (bw) — install via: sudo snap install bw # - Bitwarden CLI (bw) — install via the bootstrap script or download the Linux binary from GitHub
# - jq — install via: sudo apt install jq # - jq — install via: sudo apt install jq
# - BW_SESSION environment variable set # - BW_SESSION environment variable set
# #
@@ -33,7 +33,7 @@ done
# --- Preflight checks --- # --- Preflight checks ---
if ! command -v bw &>/dev/null; then if ! command -v bw &>/dev/null; then
echo "Bitwarden CLI (bw) not found. Install it with: sudo snap install bw" >&2 echo "Bitwarden CLI (bw) not found. Run the bootstrap script or download the Linux binary from GitHub." >&2
exit 1 exit 1
fi fi