use full path for bw CLI since /usr/local/bin may not be in PATH
This commit is contained in:
@@ -35,7 +35,8 @@ echo "==> Installing dependencies..."
|
|||||||
dnf install -y git-crypt
|
dnf install -y git-crypt
|
||||||
dnf module install -y nodejs:20/common
|
dnf module install -y nodejs:20/common
|
||||||
|
|
||||||
if ! command -v bw &>/dev/null; then
|
BW_CLI="$(npm config get prefix)/bin/bw"
|
||||||
|
if [ ! -x "$BW_CLI" ]; then
|
||||||
echo "==> Installing Bitwarden CLI..."
|
echo "==> Installing Bitwarden CLI..."
|
||||||
npm install -g @bitwarden/cli
|
npm install -g @bitwarden/cli
|
||||||
fi
|
fi
|
||||||
@@ -47,16 +48,16 @@ cd "$REPO_DIR" && git checkout -- .
|
|||||||
|
|
||||||
echo "==> Unlocking git-crypt via Bitwarden..."
|
echo "==> Unlocking git-crypt via Bitwarden..."
|
||||||
echo " Log in to Bitwarden when prompted."
|
echo " Log in to Bitwarden when prompted."
|
||||||
if bw status 2>/dev/null | grep -q '"status":"unauthenticated"'; then
|
if "$BW_CLI" status 2>/dev/null | grep -q '"status":"unauthenticated"'; then
|
||||||
bw login
|
"$BW_CLI" login
|
||||||
fi
|
fi
|
||||||
BW_SESSION=$(bw unlock --raw)
|
BW_SESSION=$("$BW_CLI" unlock --raw)
|
||||||
bw sync --session "$BW_SESSION"
|
"$BW_CLI" sync --session "$BW_SESSION"
|
||||||
bw get notes hantim-git-crypt-key --session "$BW_SESSION" | base64 -d > /tmp/git-crypt-key
|
"$BW_CLI" get notes hantim-git-crypt-key --session "$BW_SESSION" | base64 -d > /tmp/git-crypt-key
|
||||||
cd "$REPO_DIR"
|
cd "$REPO_DIR"
|
||||||
git-crypt unlock /tmp/git-crypt-key
|
git-crypt unlock /tmp/git-crypt-key
|
||||||
rm /tmp/git-crypt-key
|
rm /tmp/git-crypt-key
|
||||||
bw lock
|
"$BW_CLI" lock
|
||||||
|
|
||||||
# --- Install Docker ---
|
# --- Install Docker ---
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user