server: update to v2.3 — dual-protocol relay (v1 pair + v2 lobby) + auto-updater with EXIT trap fix

server/install.sh

@@ -7,12 +7,16 @@
 #   sudo ./install.sh
 #
 # What it does:
-#   1. Sanity checks: systemd present, python3 present.
+#   1. Sanity checks: systemd present, python3 present, curl present.
 #   2. Copies remsound-relay.py to /usr/local/sbin/.
 #   3. Copies remsound-relay.service to /etc/systemd/system/.
-#   4. Creates an empty /var/log/remsound-relay.log if missing.
+#   4. Copies the auto-updater script + service + timer.
-#   5. systemctl daemon-reload, enable + start the service.
+#   5. Creates empty log files.
-#   6. Prints status and the last few log lines so you can see it's alive.
+#   6. Writes /etc/remsound-relay/version with the bundled tag.
+#   7. Snapshots the current install to /etc/remsound-relay/backup/ so the
+#      auto-updater has somewhere to roll back to on a bad future release.
+#   8. systemctl daemon-reload, enable + start the relay + updater timer.
+#   9. Prints status and the last few log lines.
 
 set -euo pipefail
 
@@ -21,24 +25,38 @@ if [[ $EUID -ne 0 ]]; then
   exit 1
 fi
 
-# Resolve the directory this script lives in, regardless of where it was launched from.
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 
-if [[ ! -f "$SCRIPT_DIR/remsound-relay.py" || ! -f "$SCRIPT_DIR/remsound-relay.service" ]]; then
+REQUIRED=(
-  echo "Cannot find remsound-relay.py and/or remsound-relay.service next to install.sh." >&2
+  remsound-relay.py
-  echo "Run the installer from inside the unzipped bundle folder." >&2
+  remsound-relay.service
+  remsound-relay-update.sh
+  remsound-relay-update.service
+  remsound-relay-update.timer
+  VERSION
+)
+for f in "${REQUIRED[@]}"; do
+  if [[ ! -f "$SCRIPT_DIR/$f" ]]; then
+    echo "Bundle is missing $f. Run the installer from inside the unzipped bundle folder." >&2
     exit 1
-fi
+  fi
+done
 
 if ! command -v systemctl >/dev/null 2>&1; then
-  echo "systemctl not found. This bundle expects a systemd-based Linux (Raspberry Pi OS, Debian, Ubuntu, etc.)." >&2
+  echo "systemctl not found. This bundle expects a systemd-based Linux." >&2
   exit 1
 fi
-
 if ! command -v python3 >/dev/null 2>&1; then
   echo "python3 not found. Install it first: sudo apt-get install -y python3" >&2
   exit 1
 fi
+if ! command -v curl >/dev/null 2>&1; then
+  echo "curl not found. Install it first: sudo apt-get install -y curl" >&2
+  exit 1
+fi
+
+VERSION_TAG="$(tr -d '[:space:]' < "$SCRIPT_DIR/VERSION")"
+echo "Installing RemSound relay bundle $VERSION_TAG ..."
 
 echo "Installing relay script to /usr/local/sbin/remsound-relay.py ..."
 install -o root -g root -m 755 "$SCRIPT_DIR/remsound-relay.py" /usr/local/sbin/remsound-relay.py
@@ -47,25 +65,61 @@ python3 -m py_compile /usr/local/sbin/remsound-relay.py
 echo "Installing systemd unit to /etc/systemd/system/remsound-relay.service ..."
 install -o root -g root -m 644 "$SCRIPT_DIR/remsound-relay.service" /etc/systemd/system/remsound-relay.service
 
-echo "Ensuring log file exists ..."
+echo "Installing auto-updater script to /usr/local/sbin/remsound-relay-update.sh ..."
-touch /var/log/remsound-relay.log
+install -o root -g root -m 755 "$SCRIPT_DIR/remsound-relay-update.sh" /usr/local/sbin/remsound-relay-update.sh
-chown root:root /var/log/remsound-relay.log
-chmod 0644 /var/log/remsound-relay.log
 
-echo "Reloading systemd, enabling, and starting remsound-relay ..."
+echo "Installing auto-updater systemd units ..."
+install -o root -g root -m 644 "$SCRIPT_DIR/remsound-relay-update.service" /etc/systemd/system/remsound-relay-update.service
+install -o root -g root -m 644 "$SCRIPT_DIR/remsound-relay-update.timer" /etc/systemd/system/remsound-relay-update.timer
+
+echo "Ensuring log files exist ..."
+touch /var/log/remsound-relay.log /var/log/remsound-relay-update.log
+chown root:root /var/log/remsound-relay.log /var/log/remsound-relay-update.log
+chmod 0644 /var/log/remsound-relay.log /var/log/remsound-relay-update.log
+
+echo "Writing version stamp ..."
+mkdir -p /etc/remsound-relay /etc/remsound-relay/backup
+printf '%s\n' "$VERSION_TAG" > /etc/remsound-relay/version
+
+echo "Snapshotting installed files to /etc/remsound-relay/backup/ for rollback ..."
+rm -rf /etc/remsound-relay/backup
+mkdir -p /etc/remsound-relay/backup
+for f in \
+  /usr/local/sbin/remsound-relay.py \
+  /usr/local/sbin/remsound-relay-update.sh \
+  /etc/systemd/system/remsound-relay.service \
+  /etc/systemd/system/remsound-relay-update.service \
+  /etc/systemd/system/remsound-relay-update.timer \
+  /etc/remsound-relay/version
+do
+  if [[ -f "$f" ]]; then
+    cp -a "$f" "/etc/remsound-relay/backup/$(basename "$f")"
+  fi
+done
+
+echo "Reloading systemd ..."
 systemctl daemon-reload
+
+echo "Enabling and starting remsound-relay.service ..."
 systemctl enable remsound-relay.service >/dev/null
 systemctl restart remsound-relay.service
 
-# Give the service a beat to come up before we try to read its state.
+echo "Enabling and starting remsound-relay-update.timer ..."
+systemctl enable remsound-relay-update.timer >/dev/null
+systemctl restart remsound-relay-update.timer
+
 sleep 1
 
 echo
-echo "=== service status ==="
+echo "=== relay service status ==="
 systemctl --no-pager --full status remsound-relay.service || true
 
 echo
-echo "=== last 10 log lines ==="
+echo "=== updater timer status ==="
+systemctl --no-pager status remsound-relay-update.timer || true
+
+echo
+echo "=== last 10 relay log lines ==="
 tail -n 10 /var/log/remsound-relay.log 2>/dev/null || echo "(log empty so far)"
 
 echo
@@ -78,6 +132,10 @@ fi
 
 echo
 echo "Install complete. The relay is running on UDP 47830."
-echo "Next step: open a UDP 47830 port-forward on your router toward this Pi's LAN address,"
+echo "Installed version: $VERSION_TAG"
-echo "then dial the Pi's public hostname:47830 from RemSound on each end."
+echo "Auto-updates: enabled (hourly via remsound-relay-update.timer)."
+echo
+echo "To disable auto-updates: sudo systemctl disable --now remsound-relay-update.timer"
+echo "To check for updates manually: sudo systemctl start remsound-relay-update.service"
+echo "Update history log: /var/log/remsound-relay-update.log"
 echo "See README.md for full operational notes."