From e5b6204875eb081798493985e1502bd6218b1cc7 Mon Sep 17 00:00:00 2001
From: Ben Duncan <5178243+benduncan@users.noreply.github.com>
Date: Thu, 2 Apr 2026 13:53:29 +1000
Subject: [PATCH] Fix service helper sequence

---
 scripts/setup.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/setup.sh b/scripts/setup.sh
index f64c9a92a..cc016de0b 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -235,14 +235,6 @@ install_files() {
         info "  /usr/local/share/spinifex/setup-ovn.sh"
     fi
 
-    # Service helper scripts
-    if [ -d "$EXTRACT_DIR/scripts" ]; then
-        for script in "$EXTRACT_DIR"/scripts/*.sh; do
-            $SUDO install -o "$SPINIFEX_USER" -g "$SPINIFEX_GROUP" -m 0755 \
-                "$script" "/var/lib/spinifex/$(basename "$script")"
-            info "  /var/lib/spinifex/$(basename "$script")"
-        done
-    fi
 }
 
 # --- Create directories ---
@@ -282,6 +274,15 @@ SPINIFEX_VIPERBLOCK_PLUGIN_PATH=${PLUGINDIR}/nbdkit-viperblock-plugin.so
 EOF
     $SUDO chown "$SPINIFEX_USER:$SPINIFEX_GROUP" /etc/spinifex/systemd.env
     info "Generated /etc/spinifex/systemd.env"
+
+    # Service helper scripts
+    if [ -d "$EXTRACT_DIR/scripts" ]; then
+        for script in "$EXTRACT_DIR"/scripts/*.sh; do
+            $SUDO install -o "$SPINIFEX_USER" -g "$SPINIFEX_GROUP" -m 0755 \
+                "$script" "/var/lib/spinifex/$(basename "$script")"
+            info "  /var/lib/spinifex/$(basename "$script")"
+        done
+    fi
 }
 
 # --- Install systemd units ---