Use JAVA_HOME if set. Closes GH-83

hrj · Jun 24, 2016 · dca4766 · dca4766
1 parent 6a1d3eb
commit dca4766
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/tools/abandon_cli.bat b/tools/abandon_cli.bat
@@ -1,4 +1,9 @@
 @ECHO OFF
 SET BASEDIR=%~dp0
+SET JAVA_CMD=java
 
-java -jar "%BASEDIR%\start.jar" %*
+if not "%JAVA_HOME%" == "" (
+    SET JAVA_CMD="%JAVA_HOME%\bin\java"
+)
+
+"%JAVA_CMD%" -jar "%BASEDIR%\start.jar" %*
diff --git a/tools/abandon_cli.sh b/tools/abandon_cli.sh
@@ -1,3 +1,10 @@
+JAVA_CMD=java
+
+if [ $JAVA_HOME ]
+then
+  JAVA_CMD=$JAVA_HOME/bin/java;
+fi
+
 BASEDIR=`dirname $0`
 
-java -jar ${BASEDIR}/start.jar $*
+$JAVA_CMD -jar ${BASEDIR}/start.jar $*
diff --git a/tools/abandon_gui.bat b/tools/abandon_gui.bat
@@ -1,4 +1,10 @@
 @ECHO OFF
 SET BASEDIR=%~dp0
 
-java -jar "%BASEDIR%\start.jar" -g %*
+SET JAVA_CMD=java
+
+if not "%JAVA_HOME%" == "" (
+    SET JAVA_CMD="%JAVA_HOME%\bin\java"
+)
+
+"%JAVA_CMD%" -jar "%BASEDIR%\start.jar" -g %*
diff --git a/tools/abandon_gui.sh b/tools/abandon_gui.sh
@@ -1,3 +1,10 @@
+JAVA_CMD=java
+
+if [ $JAVA_HOME ]
+then
+  JAVA_CMD=$JAVA_HOME/bin/java;
+fi
+
 BASEDIR=`dirname $0`
 
-java -jar ${BASEDIR}/start.jar -g $*
+$JAVA_CMD -jar ${BASEDIR}/start.jar -g $*