Refactor postinst and package-deb.sh to use SPINUP_ROOT_DIR variable for consistency

Author: iskandervdh

packaging/DEBIAN/postinst

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+SPINUP_ROOT_DIR="/etc/spinup"
+
 # Make sure the script is being run as root
 if [ "$(id -u)" -ne 0 ]; then
     echo "This script must be run as root" >&2
@@ -20,17 +22,17 @@ fi
 #####################
 
 # Create the spinup directory if it doesn't exist
-mkdir -p /etc/spinup
+mkdir -p "$SPINUP_ROOT_DIR"
 
 # Create the config directory if it doesn't exist
-mkdir -p /etc/spinup/config
+mkdir -p "$SPINUP_ROOT_DIR/config"
 
 # Remove the old symlink if it exists and create a new one
 rm -f /usr/bin/spinup
-ln -s /etc/spinup/bin/spinup /usr/bin/spinup
+ln -s "$SPINUP_ROOT_DIR/bin/spinup" /usr/bin/spinup
 
 # Set the correct permissions on the spinup directory
-chown -R root:root /etc/spinup
+chown -R root:root "$SPINUP_ROOT_DIR"
 
 ###############
 ### Dnsmasq ###
@@ -42,15 +44,15 @@ mkdir -p /etc/dnsmasq.d
 # Check if the spinup.conf already exists in the dnsmasq.d directory
 if [ ! -f /etc/dnsmasq.d/spinup.conf ]; then
     # Link the dnsmasq configuration file for spinup to the dnsmasq.d directory if it doesn't exist
-    ln -s /etc/spinup/config/dnsmasq.conf /etc/dnsmasq.d/spinup.conf
+    ln -s "$SPINUP_ROOT_DIR/config/dnsmasq.conf" /etc/dnsmasq.d/spinup.conf
 fi
 
 #############
 ### Nginx ###
 #############
 
 USER_SPINUP_NGINX_DIR="$USER_HOME/.config/spinup/nginx"
-SPINUP_NGINX_DIR="/etc/spinup/config/nginx"
+SPINUP_NGINX_DIR="$SPINUP_ROOT_DIR/config/nginx"
 
 # Create the user's spinup nginx directory if it doesn't exist
 mkdir -p $USER_SPINUP_NGINX_DIR

scripts/release/package-deb.sh

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 
+SPINUP_ROOT_DIR="/etc/spinup"
 SPINUP_VERSION=$(cat ./common/.version | sed 's/^v//')
 
 for os_version in "" "-ubuntu24.04"; do
     # Create the directory structure for the .deb package
     mkdir -p deb/spinup-${SPINUP_VERSION}${os_version}/DEBIAN
-    mkdir -p deb/spinup-${SPINUP_VERSION}${os_version}/etc/spinup/bin
+    mkdir -p deb/spinup-${SPINUP_VERSION}${os_version}${SPINUP_ROOT_DIR}/bin
 
     # Copy the necessary files to the .deb package directory
-    cp build/bin/spinup-${SPINUP_VERSION}${os_version} deb/spinup-${SPINUP_VERSION}${os_version}/etc/spinup/bin/spinup
+    cp build/bin/spinup-${SPINUP_VERSION}${os_version} deb/spinup-${SPINUP_VERSION}${os_version}${SPINUP_ROOT_DIR}/bin/spinup
     cp packaging/DEBIAN/* deb/spinup-${SPINUP_VERSION}${os_version}/DEBIAN
     cp -r packaging/unix/usr deb/spinup-${SPINUP_VERSION}${os_version}
     cp -r packaging/unix/etc deb/spinup-${SPINUP_VERSION}${os_version}