From d78643160cdcd3547001c5b8a42036e4931f9cf9 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 20 Apr 2024 21:43:31 +0200
Subject: [PATCH] Update MacOS package names and fic another launch script bug

---
 .github/workflows/build.yml | 8 ++++----
 setup/macos/build.sh        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4050a6ea..79407646 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,7 +79,7 @@ jobs:
     runs-on: macos-12
     env:
       PYTHON_VERSION: "3.12"
-      ARCHITECTURE: amd64
+      PACKAGE_ARCH: x86_64
       MINICONDA_ARCH: x86_64
     steps:
       - name: Checkout
@@ -92,7 +92,7 @@ jobs:
           path: novelwriter/assets
 
       - name: Build App Bundle
-        run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH
+        run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
 
       - name: Upload DMG
         uses: actions/upload-artifact@v4
@@ -107,7 +107,7 @@ jobs:
     runs-on: macos-14
     env:
       PYTHON_VERSION: "3.12"
-      ARCHITECTURE: arm64
+      PACKAGE_ARCH: aarch64
       MINICONDA_ARCH: arm64
     steps:
       - name: Checkout
@@ -120,7 +120,7 @@ jobs:
           path: novelwriter/assets
 
       - name: Build App Bundle
-        run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH
+        run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
 
       - name: Upload DMG
         uses: actions/upload-artifact@v4
diff --git a/setup/macos/build.sh b/setup/macos/build.sh
index fb33b47f..e57b3f8d 100755
--- a/setup/macos/build.sh
+++ b/setup/macos/build.sh
@@ -137,8 +137,8 @@ cp $SRC_DIR/setup/macos/novelwriter.icns novelWriter.app/Contents/Resources/
 # Create entry script
 echo "Creating entry script ..."
 cat > novelWriter.app/Contents/MacOS/novelWriter << EOF
-DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 #!/bin/bash
+DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 \$DIR/../Resources/bin/python -sE \$DIR/../Resources/novelWriter/novelWriter.py \$@
 EOF