From de1d29eb94cfc5896e82b55f5166d6a926b0c0a0 Mon Sep 17 00:00:00 2001
From: GabCoolGuy <gabrielfreville@proton.me>
Date: Thu, 21 Nov 2024 08:22:11 +0100
Subject: [PATCH] Replace `&&` op with `||` to hopefully fix macos artifacts's
 names, also hopefully fixed headless macos artifacts just not getting
 published

---
 distribution/macos/create_macos_build_ava.sh      |  4 ++--
 distribution/macos/create_macos_build_headless.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh
index e6b235128..0ee3000b4 100755
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -21,10 +21,10 @@ CONFIGURATION=$7
 EXTRA_ARGS=$8
 CANARY=$9
 
-if [ "$VERSION" == "1.1.0" ] && [ "$CANARY" == 1 ];
+if [ "$VERSION" == "1.1.0" ] || [ "$CANARY" == 1 ];
 then
   RELEASE_TAR_FILE_NAME=ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
-elif [ "$VERSION" == "1.1.0" ] && [ "$CANARY" == 0 ];
+elif [ "$VERSION" == "1.1.0" ];
 then
   RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
 else
diff --git a/distribution/macos/create_macos_build_headless.sh b/distribution/macos/create_macos_build_headless.sh
index e2a10562a..ace884614 100755
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -21,14 +21,14 @@ CONFIGURATION=$7
 EXTRA_ARGS=$8
 CANARY=$9
 
-if [ "$VERSION" == "1.1.0" ] && [ "$CANARY" == 1 ];
+if [ "$VERSION" == "1.1.0" ] || [ "$CANARY" == 1 ];
 then
-  RELEASE_TAR_FILE_NAME=ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
-elif [ "$VERSION" == "1.1.0" ] && [ "$CANARY" == 0 ];
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
+elif [ "$VERSION" == "1.1.0" ];
 then
-  RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar
 else
-  RELEASE_TAR_FILE_NAME=ryujinx-$VERSION-macos_universal.app.tar
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.app.tar
 fi
 
 ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"