From 9be53ba033cf26c3eb353d3758c89cefed53ccfd Mon Sep 17 00:00:00 2001
From: Ryan <ryantl66@gmail.com>
Date: Sun, 9 Nov 2025 20:01:21 -0500
Subject: [PATCH] chore(scripts): fix shellcheck SC2148 and harden
 manual-sync.sh

---
 scripts/manual-sync.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/scripts/manual-sync.sh b/scripts/manual-sync.sh
index 2493959..ab5b6cb 100644
--- a/scripts/manual-sync.sh
+++ b/scripts/manual-sync.sh
@@ -1,5 +1,8 @@
+#!/usr/bin/env bash
 # === Update FileRise to v1.9.1 (safe rsync) ===
-set -euo pipefail
+# shellcheck disable=SC2155  # we intentionally assign 'stamp' with command substitution
+
+set -Eeuo pipefail
 
 VER="v1.9.1"
 ASSET="FileRise-${VER}.zip"          # If the asset name is different, set it exactly (e.g. FileRise-v1.9.0.zip)
@@ -14,8 +17,9 @@ tar -C "$WEBROOT" -czf "/root/backups/filerise-$stamp.tgz" \
 echo "Backup saved to /root/backups/filerise-$stamp.tgz"
 
 # 1) Fetch the release zip
-rm -rf "$TMP" && mkdir -p "$TMP"
-curl -L "https://github.com/error311/FileRise/releases/download/${VER}/${ASSET}" -o "$TMP/$ASSET"
+rm -rf "$TMP"
+mkdir -p "$TMP"
+curl -fsSL "https://github.com/error311/FileRise/releases/download/${VER}/${ASSET}" -o "$TMP/$ASSET"
 
 # 2) Unzip to a staging dir
 unzip -q "$TMP/$ASSET" -d "$TMP"
@@ -26,13 +30,13 @@ STAGE_DIR="$(find "$TMP" -maxdepth 1 -type d -name 'FileRise*' ! -path "$TMP" |
 #    - keep public/.htaccess
 #    - keep data dirs and current config.php
 rsync -a --delete \
-  --exclude 'public/.htaccess' \
-  --exclude 'uploads/***' \
-  --exclude 'users/***' \
-  --exclude 'metadata/***' \
-  --exclude 'config/config.php' \
-  --exclude '.github/***' \
-  --exclude 'docker-compose.yml' \
+  --exclude='public/.htaccess' \
+  --exclude='uploads/***' \
+  --exclude='users/***' \
+  --exclude='metadata/***' \
+  --exclude='config/config.php' \
+  --exclude='.github/***' \
+  --exclude='docker-compose.yml' \
   "$STAGE_DIR"/ "$WEBROOT"/
 
 # 4) Ownership (Ubuntu/Debian w/ Apache)
@@ -40,11 +44,11 @@ chown -R www-data:www-data "$WEBROOT"
 
 # 5) (optional) Composer autoload optimization if composer is available
 if command -v composer >/dev/null 2>&1; then
-  cd "$WEBROOT"
+  cd "$WEBROOT" || { echo "cd to $WEBROOT failed" >&2; exit 1; }
   composer install --no-dev --optimize-autoloader
 fi
 
-# 6) Reload Apache
-systemctl reload apache2
+# 6) Reload Apache (don’t fail the whole script if reload isn’t available)
+systemctl reload apache2 2>/dev/null || true
 
 echo "✅ FileRise updated to ${VER} (code). Data and public/.htaccess preserved."
\ No newline at end of file