From ea2b5c30c7cf2ece0b725d0c8ed2d6ce63a76171 Mon Sep 17 00:00:00 2001 From: Joe Gitta Date: Fri, 22 May 2026 20:44:13 +0000 Subject: [PATCH] deploy.sh: always restart kiosk-dev; production is optional best-effort --- deploy.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/deploy.sh b/deploy.sh index b45080d..79cae63 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,7 +1,8 @@ #!/bin/bash -# Deploy latest kiosk code to the production kiosk +# Deploy latest kiosk code. +# Always commits to Gitea and restarts kiosk-dev (dev/test machine). +# If the production kiosk is reachable, deploys there too. # Usage: ./deploy.sh ["commit message"] -set -e KIOSK_LOCAL="jgitta@192.168.88.44" KIOSK_REMOTE="jgitta@100.64.0.1" @@ -13,23 +14,28 @@ git -C "$REPO_DIR" add -A git -C "$REPO_DIR" commit -m "$COMMIT_MSG" 2>/dev/null || echo " (nothing new to commit)" git -C "$REPO_DIR" push origin master || echo " (nothing new to push)" -echo "==> Deploying to production kiosk..." +echo "==> Restarting kiosk-dev..." +/usr/local/bin/kiosk-restart + +echo "==> Trying production kiosk..." KIOSK="" if ssh -o ConnectTimeout=5 -o BatchMode=yes $KIOSK_LOCAL "echo ok" &>/dev/null; then KIOSK="$KIOSK_LOCAL" - echo " Reaching kiosk via local network" + echo " Reaching production via local network" elif ssh -o ConnectTimeout=8 -o BatchMode=yes $KIOSK_REMOTE "echo ok" &>/dev/null; then KIOSK="$KIOSK_REMOTE" - echo " Reaching kiosk via Tailscale" + echo " Reaching production via Tailscale" else - echo "ERROR: Cannot reach kiosk on local or Tailscale" - exit 1 + echo " Production kiosk unreachable — skipping (will deploy when online)" fi -ssh "$KIOSK" " - cd /home/jgitta/kiosk-browser - git pull - /usr/local/bin/kiosk-restart -" +if [ -n "$KIOSK" ]; then + ssh "$KIOSK" " + cd /home/jgitta/kiosk-browser + git pull + /usr/local/bin/kiosk-restart + " + echo " Production updated." +fi echo "==> Deploy complete!"