Index: trunk/native/macosx/macos-jpackage.sh
===================================================================
--- trunk/native/macosx/macos-jpackage.sh	(revision 18475)
+++ trunk/native/macosx/macos-jpackage.sh	(revision 18476)
@@ -30,4 +30,6 @@
     echo "A JOSM.app will be created but not signed nor notarized."
     SIGNAPP=false
+    KEYCHAINPATH=false
+    JPACKAGEOPTIONS=""
 else
     echo "Preparing certificates/keychain for signing…"
@@ -47,13 +49,8 @@
     SIGNAPP=true
     echo "Signing preparation done."
+    JPACKAGEOPTIONS="--mac-sign --mac-signing-keychain $KEYCHAINPATH"
 fi
 
 set -u
-
-if $SIGNAPP; then
-  JPACKAGEOPTIONS="--mac-sign --mac-signing-keychain $KEYCHAINPATH"
-else
-  JPACKAGEOPTIONS=""
-fi
 
 echo "Building and signing app"
@@ -76,8 +73,6 @@
     --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
     --vendor "JOSM" \
-    --mac-sign \
     --mac-package-identifier de.openstreetmap.josm \
     --mac-package-signing-prefix de.openstreetmap.josm \
-    --mac-signing-keychain $KEYCHAINPATH \
     --file-associations native/file-associations/bz2.properties \
     --file-associations native/file-associations/geojson.properties \