commit a40067d19f192ea87481da2f41a6be808ea25b01
author Donal Fellows <donal.k.fellows@manchester.ac.uk> Tue Apr 08 14:17:02 2014 +0100
committer Donal Fellows <donal.k.fellows@manchester.ac.uk> Tue Apr 08 14:17:02 2014 +0100
tree 7b3c473f336d623a27cef1da68876ed7444ca0d8
parent c28d25227856392784bf27ec2d3bd799f8f4c7b5
parent c02558b78fcf32fc99cdf974ee349881c89b4213

Merge branch 'shell-fix' into biodiversity

src/main/resources/taverna.bat

diff --git a/src/main/resources/taverna.bat b/src/main/resources/taverna.bat
index db74d23..0e15973 100644
--- a/src/main/resources/taverna.bat
+++ b/src/main/resources/taverna.bat
@@ -21,6 +21,10 @@
 

 for /F "delims=" %%a in ('dir /b "%TAVERNA_HOME%lib" ^|findstr /c:prelauncher') do set JAR_FILE=%%a

 

-java %ARGS% -jar "%TAVERNA_HOME%lib\%JAR_FILE%" %*

+IF EXIST "%TAVERNA_HOME%\jre\bin\java.exe" (

+ "%TAVERNA_HOME%\jre\bin\java" %ARGS% -jar "%TAVERNA_HOME%lib\%JAR_FILE%" %*

+) ELSE (

+ java %ARGS% -jar "%TAVERNA_HOME%lib\%JAR_FILE%" %*

+)

 

 pause

src/main/resources/taverna.sh

diff --git a/src/main/resources/taverna.sh b/src/main/resources/taverna.sh
index 8a9ddfd..70aafde 100755
--- a/src/main/resources/taverna.sh
+++ b/src/main/resources/taverna.sh
@@ -12,7 +12,9 @@
 realprog=`real_path "$prog"`
 taverna_home=`dirname "$realprog"`
 javabin=java
-if test -x "$JAVA_HOME/bin/java"; then
+if test -x "$taverna_home/jre/bin/java"; then
+    javabin="$taverna_home/jre/bin/java"
+elif test -x "$JAVA_HOME/bin/java"; then
     javabin="$JAVA_HOME/bin/java"
 fi