From 3a1c884bec29cf9b5a732872a7678cf1cdf158ff Mon Sep 17 00:00:00 2001 From: GabCoolGuy Date: Thu, 21 Nov 2024 08:08:24 +0100 Subject: [PATCH] Fix faulty if statement formatting This should make it so that macos builds compile like intended --- distribution/macos/create_macos_build_ava.sh | 5 ++--- distribution/macos/create_macos_build_headless.sh | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh index f82acda8b..e6b235128 100755 --- a/distribution/macos/create_macos_build_ava.sh +++ b/distribution/macos/create_macos_build_ava.sh @@ -21,11 +21,10 @@ CONFIGURATION=$7 EXTRA_ARGS=$8 CANARY=$9 -# shellcheck disable=SC2107 -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" ] && [ "$CANARY" == 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 310828758..e2a10562a 100755 --- a/distribution/macos/create_macos_build_headless.sh +++ b/distribution/macos/create_macos_build_headless.sh @@ -3,7 +3,7 @@ set -e if [ "$#" -lt 7 ]; then - echo "usage " + echo "usage " exit 1 fi @@ -21,11 +21,10 @@ CONFIGURATION=$7 EXTRA_ARGS=$8 CANARY=$9 -# shellcheck disable=SC2107 -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" ] && [ "$CANARY" == 0 ]; then RELEASE_TAR_FILE_NAME=ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.app.tar else