From dca47660442ec700753cbaab1e0a47bd233f97b9 Mon Sep 17 00:00:00 2001
From: hrj <harshad.rj@gmail.com>
Date: Fri, 24 Jun 2016 19:57:28 +0530
Subject: [PATCH] Use JAVA_HOME if set. Closes GH-83

---
 tools/abandon_cli.bat | 7 ++++++-
 tools/abandon_cli.sh  | 9 ++++++++-
 tools/abandon_gui.bat | 8 +++++++-
 tools/abandon_gui.sh  | 9 ++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/tools/abandon_cli.bat b/tools/abandon_cli.bat
index 336c196d..9f8a806c 100644
--- 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
index 20be9095..75e399ac 100755
--- 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
index 38294082..6ed5181c 100644
--- 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
index fca53f85..620b029b 100755
--- 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 $*