Merge pull request #604 from aionnetwork/gui-java-cmd-fix

aion_gui.sh script bug fix
aionnetwork · Aug 17, 2018 · fc9fd98 · fc9fd98
2 parents 7f1cb1a + 001408c
commit fc9fd98
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/aion_gui.sh b/aion_gui.sh
@@ -1,7 +1,15 @@
 #!/bin/bash 
+JAVA_CMD=java
+if [ -d "./rt" ]; then
+        JAVA_CMD="./rt/bin/java"
+elif [ -d "./pack/rt" ]; then
+        JAVA_CMD="./pack/rt/bin/java"
+elif [ -d "$JAVA_HOME" ]; then
+        JAVA_CMD="$JAVA_HOME/bin/java"
+fi
 
 STORAGE_DIR=${HOME}/.aion
-env EVMJIT="-cache=1" java -Xms4g \
+env EVMJIT="-cache=1" $JAVA_CMD -Xms4g \
     --add-opens=javafx.graphics/javafx.scene.text=ALL-UNNAMED \
     --add-opens=javafx.graphics/com.sun.javafx.text=ALL-UNNAMED \
     --add-opens=java.base/java.nio=ALL-UNNAMED \

diff --git a/script/prepack.sh b/script/prepack.sh
@@ -21,7 +21,7 @@ fi
 
 # generate aion runtime
 if [ ! -d "$JDK_RT" ]; then
-  $JDK_PATH/bin/jlink --module-path $JDK_PATH/jmods --add-modules java.base,java.xml,java.logging,java.management,jdk.unsupported,javafx.graphics --output $JDK_RT
+  $JDK_PATH/bin/jlink --module-path $JDK_PATH/jmods --add-modules java.base,java.xml,java.logging,java.management,jdk.unsupported,javafx.graphics,javafx.controls,javafx.base,jdk.sctp,javafx.fxml --output $JDK_RT
   cp $JDK_PATH/bin/jstack $JDK_RT/bin
 fi