From d7b1dae98b83ceabd4fbca2faf0b7ba113132ed8 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Fri, 2 Oct 2020 20:03:07 +0200 Subject: [PATCH] macOS: Handle OS version 11.0 in package script (#1646) --- scripts/package/macos-package-app.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/package/macos-package-app.sh b/scripts/package/macos-package-app.sh index 410a2112a..571a1ca5e 100755 --- a/scripts/package/macos-package-app.sh +++ b/scripts/package/macos-package-app.sh @@ -7,7 +7,8 @@ fi VERSION=$(python3 -c 'import picard; print(picard.__version__)') MACOS_VERSION=$(sw_vers -productVersion) -MACOS_VERSION_MAJOR=${MACOS_VERSION%.*.*} +MACOS_VERSION_MAJOR=${MACOS_VERSION%.*} +MACOS_VERSION_MAJOR=${MACOS_VERSION_MAJOR%.*} MACOS_VERSION_MINOR=${MACOS_VERSION#*.} MACOS_VERSION_MINOR=${MACOS_VERSION_MINOR%.*} @@ -43,7 +44,7 @@ if [ -f scripts/package/appledev.p12 ] && [ -n "$appledev_p12_password" ]; then fi # Submit app for notarization on macOS >= 10.14 -if [ "$MACOS_VERSION_MAJOR" -eq 10 ] && [ "$MACOS_VERSION_MINOR" -ge 14 ]; then +if { [ "$MACOS_VERSION_MAJOR" -eq 10 ] && [ "$MACOS_VERSION_MINOR" -ge 14 ]; } || [ "$MACOS_VERSION_MAJOR" -ge 11 ]; then NOTARIZE=1 fi