Changeset 17396 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-12-07T15:40:50+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20143 - make restart work with new macOS package built with jpackage

File:

• trunk/src/org/openstreetmap/josm/actions/RestartAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -37 +37 @@
 
     private static final String APPLE_OSASCRIPT = "/usr/bin/osascript";
+    private static final String APPLE_APP_PATH = "/JOSM.app/Contents/";
 
     // AppleScript to restart OS X package
@@ -146 +147 @@
     private static List<String> determineRestartCommands() {
         try {
-            // special handling for OSX .app package
-            if (PlatformManager.isPlatformOsx() && getSystemProperty("java.library.path").contains("/JOSM.app/Contents/MacOS")) {
+            // special handling for OSX .app package (both legacy and jpackage-based)
+            if (PlatformManager.isPlatformOsx() && (
+                    getSystemProperty("java.library.path").contains(APPLE_APP_PATH) ||
+                    getSystemProperty("java.class.path").contains(APPLE_APP_PATH))) {
                 return getAppleCommands();
             } else {