From a1bcf8eb04be63f6f29b600d8296376e29ca0a0c Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 17 Feb 2026 10:38:03 +0100
Subject: [PATCH] Replace pushd/popd with cd in scripts

Replace pushd/popd directory stack usage with plain cd in ct/gramps-web.sh and install/gramps-web-install.sh, and remove the >/dev/null redirections. The frontend build and backend migration steps remain functionally the same but use simpler directory changes to avoid relying on pushd/popd output suppression.
---
 ct/gramps-web.sh              | 6 ++----
 install/gramps-web-install.sh | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ct/gramps-web.sh b/ct/gramps-web.sh
index 19f8a0858..a90a80b82 100644
--- a/ct/gramps-web.sh
+++ b/ct/gramps-web.sh
@@ -85,22 +85,20 @@ function update_script() {
     msg_ok "Updated Gramps Web API"
 
     msg_info "Updating Gramps Web Frontend"
-    pushd /opt/gramps-web/frontend >/dev/null
+    cd /opt/gramps-web/frontend
     export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
     corepack enable
     $STD npm install
     $STD npm run build
-    popd >/dev/null
     msg_ok "Updated Gramps Web Frontend"
 
     msg_info "Applying Database Migration"
-    pushd /opt/gramps-web-api >/dev/null
+    cd /opt/gramps-web-api
     GRAMPS_API_CONFIG=/opt/gramps-web/config/config.cfg \
       ALEMBIC_CONFIG=/opt/gramps-web-api/alembic.ini \
       GRAMPSHOME=/opt/gramps-web/data/gramps \
       GRAMPS_DATABASE_PATH=/opt/gramps-web/data/gramps/grampsdb \
       $STD /opt/gramps-web/venv/bin/python3 -m gramps_webapi user migrate
-    popd >/dev/null
     msg_ok "Applied Database Migration"
 
     msg_info "Starting Service"
diff --git a/install/gramps-web-install.sh b/install/gramps-web-install.sh
index 0014d670b..5a64cf5ac 100644
--- a/install/gramps-web-install.sh
+++ b/install/gramps-web-install.sh
@@ -88,20 +88,18 @@ $STD uv pip install --no-cache-dir --upgrade pip setuptools wheel
 $STD uv pip install --no-cache-dir gunicorn
 $STD uv pip install --no-cache-dir /opt/gramps-web-api
 
-pushd /opt/gramps-web/frontend >/dev/null
+cd /opt/gramps-web/frontend
 export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 corepack enable
 $STD npm install
 $STD npm run build
-popd >/dev/null
 
-pushd /opt/gramps-web-api >/dev/null
+cd /opt/gramps-web-api
 GRAMPS_API_CONFIG=/opt/gramps-web/config/config.cfg \
   ALEMBIC_CONFIG=/opt/gramps-web-api/alembic.ini \
   GRAMPSHOME=/opt/gramps-web/data/gramps \
   GRAMPS_DATABASE_PATH=/opt/gramps-web/data/gramps/grampsdb \
   $STD /opt/gramps-web/venv/bin/python3 -m gramps_webapi user migrate
-popd >/dev/null
 msg_ok "Set up Gramps Web"
 
 msg_info "Creating Service"