From beb95c49fae20723810d9ca2d797be65199232d3 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Sun, 8 Jan 2023 22:57:53 -0700
Subject: [PATCH] fix: fit artifact uploads

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 .github/workflows/build.yml | 16 +++++++++++-----
 setup/macos/build.sh        |  8 +++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f66fb62..70b32e66 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,11 +82,17 @@ jobs:
       # UPLOAD BUILDS
       ##
 
-      - name: Upload binary zip / dmg (macOS)
+      - name: Upload binary zip (macOS)
         if: runner.os == 'macOS'
         uses: actions/upload-artifact@v3
         with:
-          name: novelWriter-${{ matrix.name }}-${{ env.VERSION }}.app.zip
-          path: |
-            dist_macos/novelWriter-${{ env.VERSION }}.zip
-            dist_macos/novelWriter-${{ env.VERSION }}.dmg
+          name: novelWriter-${{ env.VERSION }}-${{ matrix.name }}.app.zip
+          path: dist_macos/novelWriter-${{ env.VERSION }}.app.zip
+      
+      - name: Upload dmg (macOS)
+        if: runner.os == 'macOS'
+        uses: actions/upload-artifact@v3
+        with:
+          name: novelWriter-${{ env.VERSION }}-${{ matrix.name }}.dmg
+          path: dist_macos/novelWriter-${{ env.VERSION }}.dmg
+      
diff --git a/setup/macos/build.sh b/setup/macos/build.sh
index 9fd91acc..e539b19d 100755
--- a/setup/macos/build.sh
+++ b/setup/macos/build.sh
@@ -15,6 +15,8 @@ SRC_DIR="$SCRIPT_DIR/../.."
 
 RLS_DIR="$SRC_DIR/dist_macos"
 
+echo "Script Dir: $SCRIPT_DIR"
+
 cleanup () {
     if [ -d "$BUILD_DIR" ]; then
         rm -rf "$BUILD_DIR"
@@ -131,12 +133,12 @@ mkdir -p $RLS_DIR
 
 brew install create-dmg
 # "--skip-jenkins" is a temporary workaround for https://github.com/create-dmg/create-dmg/issues/72
-create-dmg --volname "novelWriter $VERSION" --volicon $SCR_DIR/setup/macos/novelwriter.icns \
+create-dmg --volname "novelWriter $VERSION" --volicon $SRC_DIR/setup/macos/novelwriter.icns \
     --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon novelWriter.app 200 190 --hide-extension novelWriter.app \
-    --app-drop-link 600 185 $RLS_DIR/novelWriter-"${VERSION}"-macos.dmg "$BUILD_DIR"/
+    --app-drop-link 600 185 $RLS_DIR/novelWriter-"${VERSION}".dmg "$BUILD_DIR"/
 
 pushd $BUILD_DIR || exit 1
 zip -qr novelWriter.app.zip  novelWriter.app
 popd || exit 1
 
-mv $BUILD_DIR/novelWriter.app.zip $RLS_DIR/novelWriter-"${VERSION}"-macos.zip
+mv $BUILD_DIR/novelWriter.app.zip $RLS_DIR/novelWriter-"${VERSION}".app.zip