hantim/hantim-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move git checkout before git-crypt unlock

Browse Source 
git-crypt refuses to unlock if the working directory is dirty.
This commit is contained in:
Timothy Kim
2026-03-13 13:12:08 -04:00
parent 9fdee2e54b
commit d3d93a61b7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.sh
+3 -3
View File
@@ -42,6 +42,9 @@ fi
# --- Unlock git-crypt via Bitwarden --- # --- Unlock git-crypt via Bitwarden ---
echo "==> Restoring git-tracked files..."
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 status 2>/dev/null | grep -q '"status":"unauthenticated"'; then
@@ -91,9 +94,6 @@ chmod +x "$REPO_DIR/scripts/"*.sh
echo "==> Logging into Gitea registry..." echo "==> Logging into Gitea registry..."
echo "Run manually: docker login git.timothykim.net" echo "Run manually: docker login git.timothykim.net"
echo "==> Restoring git-tracked files..."
cd "$REPO_DIR" && git checkout -- .
echo "==> Starting services..." echo "==> Starting services..."
cd "$REPO_DIR/docker/nginx" && docker compose up -d cd "$REPO_DIR/docker/nginx" && docker compose up -d
cd "$REPO_DIR/docker/timothykim.net" && docker compose up -d cd "$REPO_DIR/docker/timothykim.net" && docker compose up -d