Changeset 19430 in josm for trunk/native/linux

Timestamp:

2025-07-17T08:13:59+02:00 (4 months ago)

Author:

stoecker

Message:

see #24339 - allow to extend module path for start script

Location:

trunk/native/linux

Files:

• latest/usr/bin/josm-latest (modified) (1 diff)
• tested/usr/bin/josm (modified) (1 diff)

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

@@ -93 +93 @@
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
         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"
+            if [[ -n "${JOSM_MODULEPATH}" ]]; then
+                JOSM_MODULEPATH="${JOSM_MODULEPATH}:${JAVAFX_HOME}"
+            else
+                JOSM_MODULEPATH="${JAVAFX_HOME}"
+            fi
+
+            JAVA_OPTS="--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"
+            JAVA_OPTS="--add-modules java.scripting,java.sql ${JAVA_OPTS}"
         fi
+
+        if [[ -n "${JOSM_MODULEPATH}" ]]; then
+            JAVA_OPTS="--module-path ${JOSM_MODULEPATH} ${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"

trunk/native/linux/tested/usr/bin/josm

@@ -93 +93 @@
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
         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"
+            if [[ -n "${JOSM_MODULEPATH}" ]]; then
+                JOSM_MODULEPATH="${JOSM_MODULEPATH}:${JAVAFX_HOME}"
+            else
+                JOSM_MODULEPATH="${JAVAFX_HOME}"
+            fi
+
+            JAVA_OPTS="--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"
+            JAVA_OPTS="--add-modules java.scripting,java.sql ${JAVA_OPTS}"
         fi
+
+        if [[ -n "${JOSM_MODULEPATH}" ]]; then
+            JAVA_OPTS="--module-path ${JOSM_MODULEPATH} ${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"