Java 11 launcher script fixes

davideby · davideby · commit ce6aeb30e5f2 · 2019-09-05T12:06:08.000+09:00
Based on fixes from IGV
diff --git a/scripts/java11/MSigDB_XML_Browser_mac.app.command b/scripts/java11/MSigDB_XML_Browser_mac.app.command
@@ -8,10 +8,10 @@
 prefix=`dirname $(readlink $0 || echo $0)`
 
 # Check whether or not to use the bundled JDK
-if [ -d "${prefix}/jdk-11" ]; then
+if [ -d "${prefix}/../jdk-11" ]; then
     echo echo "Using bundled JDK."
-    JAVA_HOME="${prefix}/jdk-11"
-    PATH=$JAVA_HOME:$PATH
+    JAVA_HOME="${prefix}/../jdk-11"
+    PATH=$JAVA_HOME/bin:$PATH
 else
     echo "Bundled JDK not found.  Using system JDK."
 fi
@@ -21,4 +21,5 @@ exec java --module-path="${prefix}/../Java/lib" -Xmx4g \
     --patch-module="jide.common=${prefix}/../Java/lib/jide-components-3.7.4.jar:${prefix}/../Java/lib/jide-dock-3.7.4.jar:${prefix}/../Java/lib/jide-grids-3.7.4.jar" \
     -Xdock:name="MSigDB XML Browser" \
     -Xdock:icon="${prefix}/../Resources/msigdb.png" \
+    -Dapple.laf.useScreenMenuBar=true \
 	--module=org.gsea-msigdb.gsea/xapps.browser.gsea.MSigDB_XML_Browser "$@"
diff --git a/scripts/java11/msigdb-xml-browser-hidpi.sh b/scripts/java11/msigdb-xml-browser-hidpi.sh
@@ -10,7 +10,7 @@ prefix=`dirname $(readlink $0 || echo $0)`
 if [ -d "${prefix}/jdk-11" ]; then
     echo echo "Using bundled JDK."
     JAVA_HOME="${prefix}/jdk-11"
-    PATH=$JAVA_HOME:$PATH
+    PATH=$JAVA_HOME/bin:$PATH
 else
     echo "Bundled JDK not found.  Using system JDK."
 fi
@@ -19,4 +19,5 @@ exec java --module-path="${prefix}/lib" -Xmx4g \
     @"${prefix}/msigdb-xml-browser.args" \
     --patch-module="jide.common=${prefix}/lib/jide-components-3.7.4.jar:${prefix}/lib/jide-dock-3.7.4.jar:${prefix}/lib/jide-grids-3.7.4.jar" \
     -Dsun.java2d.uiScale=2 \
+    -Dapple.laf.useScreenMenuBar=true \
     --module=org.gsea-msigdb.gsea/xapps.browser.gsea.MSigDB_XML_Browser "$@"
diff --git a/scripts/java11/msigdb-xml-browser.command b/scripts/java11/msigdb-xml-browser.command
@@ -11,7 +11,7 @@ prefix=`dirname $(readlink $0 || echo $0)`
 if [ -d "${prefix}/jdk-11" ]; then
     echo echo "Using bundled JDK."
     JAVA_HOME="${prefix}/jdk-11"
-    PATH=$JAVA_HOME:$PATH
+    PATH=$JAVA_HOME/bin:$PATH
 else
     echo "Bundled JDK not found.  Using system JDK."
 fi
@@ -21,4 +21,5 @@ exec java --module-path="${prefix}/lib" -Xmx4g \
     --patch-module="jide.common=${prefix}/lib/jide-components-3.7.4.jar:${prefix}/lib/jide-dock-3.7.4.jar:${prefix}/lib/jide-grids-3.7.4.jar" \
     -Xdock:name="MSigDB XML Browser" \
     -Xdock:icon="${prefix}/msigdb.png" \
+    -Dapple.laf.useScreenMenuBar=true \
     --module=org.gsea-msigdb.gsea/xapps.browser.gsea.MSigDB_XML_Browser "$@"
diff --git a/scripts/java11/msigdb-xml-browser.sh b/scripts/java11/msigdb-xml-browser.sh
@@ -10,12 +10,13 @@ prefix=`dirname $(readlink $0 || echo $0)`
 if [ -d "${prefix}/jdk-11" ]; then
     echo echo "Using bundled JDK."
     JAVA_HOME="${prefix}/jdk-11"
-    PATH=$JAVA_HOME:$PATH
+    PATH=$JAVA_HOME/bin:$PATH
 else
     echo "Bundled JDK not found.  Using system JDK."
 fi
 
 exec java --module-path="${prefix}/lib" -Xmx4g \
     @"${prefix}/msigdb-xml-browser.args" \
     --patch-module="jide.common=${prefix}/lib/jide-components-3.7.4.jar:${prefix}/lib/jide-dock-3.7.4.jar:${prefix}/lib/jide-grids-3.7.4.jar" \
+    -Dapple.laf.useScreenMenuBar=true \
     --module org.gsea-msigdb.gsea/xapps.browser.gsea.MSigDB_XML_Browser "$@"
