Changeset 19419 in josm for trunk/native/linux/latest/usr/bin

Timestamp:

2025-07-10T17:20:44+02:00 (2 days ago)

Author:

stoecker

Message:

fix #24339 - don't use JavaFX when not installed

File:

• trunk/native/linux/latest/usr/bin/josm-latest (modified) (1 diff)

trunk/native/linux/latest/usr/bin/josm-latest

@@ -92 +92 @@
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
-        JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+        if [[ -e "${JAVAFX_HOME}" ]]; then
+            JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+        else
+            JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+        fi
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"