From fd5b6a6eea801410f5aa94b7c92b430604873630 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 7 Jan 2024 13:31:43 -0800
Subject: [PATCH] Skip UI folder, fix output path for tar.gz and macOS apps

---
 .github/actions/package/package.sh | 8 ++++++--
 .github/workflows/deploy.yml       | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/actions/package/package.sh b/.github/actions/package/package.sh
index 271d269bf..b954edd68 100755
--- a/.github/actions/package/package.sh
+++ b/.github/actions/package/package.sh
@@ -11,6 +11,10 @@ do
   folderName="$runtime/$framework"
   sonarrFolder="$folderName/Sonarr"
   archiveName="Sonarr.$BRANCH.$SONARR_VERSION.$name"
+
+  if [[ "name" == 'UI' ]]; then
+    continue
+  fi
     
   echo "Creating package for $name"
 
@@ -41,12 +45,12 @@ do
     rm -r $packageFolder/Sonarr.app/Contents/MacOS/Sonarr.Update
               
     echo "Packaging macOS app Artifact"
-    (cd $packageFolder; zip -rq "../../../$artifactsFolder/$archiveName-app.zip" ./Sonarr.app)
+    (cd $packageFolder; zip -rq "../../$artifactsFolder/$archiveName-app.zip" ./Sonarr.app)
   fi
 
   echo "Packaging Artifact"
   if [[ "$name" == *"linux"* ]] || [[ "$name" == *"osx"* ]] || [[ "$name" == *"freebsd"* ]]; then
-    tar -zcf "$artifactsFolder/$archiveName.tar.gz" -C $folderName Sonarr
+    tar -zcf "./$artifactsFolder/$archiveName.tar.gz" -C $folderName Sonarr
 	fi
     
   if [[ "$name" == *"win"* ]]; then
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 56553e262..af683e9d8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -77,6 +77,7 @@ jobs:
         generateReleaseNotes: true
         name: ${{ inputs.version }}
         prerelease: ${{ inputs.branch != 'main' }}
+        skipIfReleaseExists: true
         tag: v${{ inputs.version }}
 
     - name: Publish to Services