Restructure macOS packaging to hopefully make it work correctly

Author: iskandervdh

.github/workflows/release.yml

@@ -64,6 +64,12 @@ jobs:
           cache: 'pnpm'
           cache-dependency-path: './frontend/pnpm-lock.yaml'
 
+      # Get the version from the common/.version file and set it as an environment variable
+      - name: Set SPINUP_VERSION
+        id: get_version
+        run: echo "SPINUP_VERSION=$(cat ./common/.version | sed 's/^v//')" >> $GITHUB_ENV
+        shell: bash
+
       # install Wails
       - name: Install Wails
         run: go install github.com/wailsapp/wails/v2/cmd/wails@latest
@@ -87,29 +93,26 @@ jobs:
         if: runner.os == 'Linux'
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: |
-          SPINUP_VERSION=$(cat ./common/.version | sed 's/^v//')
-          sed -i.bak "s/{{version}}/${SPINUP_VERSION}/g" wails.json && rm wails.json.bak
+          sed -i.bak "s/{{version}}/${{ env.SPINUP_VERSION }}/g" wails.json && rm wails.json.bak
 
-          wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -o ${{ matrix.build.name }}-${SPINUP_VERSION} -tags webkit2_40
-          wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -o ${{ matrix.build.name }}-${SPINUP_VERSION}-ubuntu24.04 -tags webkit2_41
+          wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -o ${{ matrix.build.name }}-${{ env.SPINUP_VERSION }} -tags webkit2_40
+          wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -o ${{ matrix.build.name }}-${{ env.SPINUP_VERSION }}-ubuntu24.04 -tags webkit2_41
         shell: bash
       - name: Build macOs App
         if: runner.os == 'macOS'
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: |
-          SPINUP_VERSION=$(cat ./common/.version | sed 's/^v//')
-          sed -i.bak "s/{{version}}/${SPINUP_VERSION}/g" wails.json && rm wails.json.bak
+          sed -i.bak "s/{{version}}/${{ env.SPINUP_VERSION }}/g" wails.json && rm wails.json.bak
 
           wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -o ${{ matrix.build.name }}
         shell: bash
       - name: Build Windows App + Installer
         if: runner.os == 'Windows'
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: |
-          SPINUP_VERSION=$(cat ./common/.version | sed 's/^v//')
-          sed -i "s/{{version}}/${SPINUP_VERSION}/g" wails.json
+          sed -i "s/{{version}}/${{ env.SPINUP_VERSION }}/g" wails.json
 
-          wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -nsis -o ${{ matrix.build.name }}-${SPINUP_VERSION}
+          wails build --platform ${{ matrix.build.platform }} -webview2 ${{ env.WEBVIEW2 }} -nsis -o ${{ matrix.build.name }}-${{ env.SPINUP_VERSION }}
         shell: bash
 
       # Add permissions to the binary
@@ -160,6 +163,16 @@ jobs:
         working-directory: ${{ env.WORKING_DIRECTORY }}
         run: bash ./scripts/release/package-rpm.sh
 
+      # Check if macOS zip installs correctly
+      - name: Check if macOS zip installs correctly
+        if: runner.os == 'macOS'
+        working-directory: ${{ env.WORKING_DIRECTORY }}
+        run: |
+          unzip -q -o ./spinup-${{ env.SPINUP_VERSION }}-macos.zip -d /tmp/spinup
+          cd /tmp/spinup/
+          sudo ./install.sh
+        shell: bash
+
       # Upload build assets
       - uses: actions/upload-artifact@v4
         with:

packaging/macos/postinstall.sh packaging/macos/install.shpackaging/macos/postinstall.sh renamed to packaging/macos/install.sh

@@ -45,6 +45,9 @@ SPINUP_SHARE_DIR="/usr/local/share/spinup"
 ### General setup ###
 #####################
 
+# Copy over the /usr/local/share/spinup directory to the correct location
+cp -r ./usr/local/share/spinup /usr/local/share
+
 # Remove the old symlink if it exists and create a new one
 rm -f /usr/local/bin/spinup
 ln -s $SPINUP_SHARE_DIR/bin/spinup /usr/local/bin/spinup
@@ -111,10 +114,12 @@ if ! grep -q "^@includedir /etc/sudoers.d[[:space:]]*$" /etc/sudoers; then
     echo "@includedir /etc/sudoers.d" | visudo -c -f - &>/dev/null && echo "@includedir /etc/sudoers.d" | EDITOR='tee -a' visudo &>/dev/null
 fi
 
-# Move the spinup sudoers file to the sudoers.d directory
-mv $SPINUP_SHARE_DIR/config/sudoers /etc/sudoers.d/spinup
-chmod 440 /etc/sudoers.d/spinup
-chown root:wheel /etc/sudoers.d/spinup
+SUDOERS_FILE=/etc/sudoers.d/spinup
+
+# Move the spinup sudoers file to the /etc/sudoers.d directory
+mv .$SUDOERS_FILE $SUDOERS_FILE
+chmod 440 $SUDOERS_FILE
+chown root:wheel $SUDOERS_FILE
 
 # Set the correct permissions on the user's spinup .config directory
 chown -R $SUDO_USER:staff $USER_HOME/.config/spinup

scripts/release/package-macos-zip.sh

@@ -2,23 +2,26 @@
 
 SPINUP_VERSION=$(cat ./common/.version | sed 's/^v//')
 
-MAC_OS_DIR="./build/macos"
+MAC_OS_DIR="./packaging/macos"
+SPINUP_SHARE_DIR="/usr/local/share/spinup"
 
 # Define the path to the binary file
 BIN_FILE="./build/bin/Spinup.app/Contents/MacOS/spinup"
 
 # Create the mac os directory
 mkdir -p $MAC_OS_DIR
 
+# Create the MacOS directory structure
+mkdir -p "$MAC_OS_DIR/etc"
+mkdir -p "$MAC_OS_DIR$SPINUP_SHARE_DIR"
+
 # Copy the contents of the build/unix directory to the MacOS directory
-cp -r "./build/unix/." $MAC_OS_DIR
+cp -r "./packaging/unix/etc/." $MAC_OS_DIR/etc
+cp -r "./packaging/unix/usr/share/spinup/." $MAC_OS_DIR$SPINUP_SHARE_DIR
 
 # Copy the binary file to the MacOS directory
-mkdir -p "$MAC_OS_DIR/usr/share/spinup/bin"
-cp $BIN_FILE "$MAC_OS_DIR/usr/share/spinup/bin"
-
-# Move the sudoers file to the config directory
-mv "$MAC_OS_DIR/etc/sudoers.d/spinup" "$MAC_OS_DIR/usr/share/spinup/config/sudoers"
+mkdir -p "$MAC_OS_DIR$SPINUP_SHARE_DIR/bin"
+cp $BIN_FILE "$MAC_OS_DIR$SPINUP_SHARE_DIR/bin"
 
 # Create a zip file containing the contents of the MacOS directory
 (cd $MAC_OS_DIR && zip -r "../../spinup-${SPINUP_VERSION}-macos.zip" .)