Separate HOP_HOME from Helma installation directory
This commit is contained in:
parent
d9a462f1ec
commit
9954933145
2 changed files with 11 additions and 6 deletions
|
@ -35,7 +35,7 @@ rem set JAVA_OPTIONS=-server -Xmx128m
|
||||||
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
|
||||||
:: Setting the script path
|
:: Setting the script path
|
||||||
set SCRIPT_DIR=%~d0%~p0
|
set INSTALL_DIR=%~d0%~p0
|
||||||
|
|
||||||
:: Using JAVA_HOME variable if defined. Otherwise,
|
:: Using JAVA_HOME variable if defined. Otherwise,
|
||||||
:: Java executable must be contained in PATH variable
|
:: Java executable must be contained in PATH variable
|
||||||
|
@ -48,7 +48,7 @@ if "%JAVA_HOME%"=="" goto default
|
||||||
|
|
||||||
:: Setting HOP_HOME to script path if undefined
|
:: Setting HOP_HOME to script path if undefined
|
||||||
if "%HOP_HOME%"=="" (
|
if "%HOP_HOME%"=="" (
|
||||||
set HOP_HOME=%SCRIPT_DIR%
|
set HOP_HOME=%INSTALL_DIR%
|
||||||
)
|
)
|
||||||
cd %HOP_HOME%
|
cd %HOP_HOME%
|
||||||
|
|
||||||
|
@ -76,4 +76,4 @@ if not "%HOP_HOME%"=="" (
|
||||||
)
|
)
|
||||||
|
|
||||||
:: Invoking the Java virtual machine
|
:: Invoking the Java virtual machine
|
||||||
%JAVACMD% %JAVA_OPTIONS% -jar launcher.jar %OPTIONS%
|
%JAVACMD% %JAVA_OPTIONS% -jar "%INSTALL_DIR%\launcher.jar" %OPTIONS%
|
||||||
|
|
|
@ -32,6 +32,11 @@ else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Get the Helma installation directory
|
||||||
|
INSTALL_DIR="${0%/*}"
|
||||||
|
cd $INSTALL_DIR
|
||||||
|
INSTALL_DIR=$PWD
|
||||||
|
|
||||||
# get HOP_HOME variable if it isn't set
|
# get HOP_HOME variable if it isn't set
|
||||||
if test -z "$HOP_HOME"; then
|
if test -z "$HOP_HOME"; then
|
||||||
# try to get HOP_HOME from script file and pwd
|
# try to get HOP_HOME from script file and pwd
|
||||||
|
@ -64,5 +69,5 @@ if [ "$HOP_HOME" ]; then
|
||||||
SWITCHES="$SWITCHES -h $HOP_HOME"
|
SWITCHES="$SWITCHES -h $HOP_HOME"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Invoking the Java VM
|
# Invoke the Java VM
|
||||||
$JAVACMD $JAVA_OPTIONS -jar launcher.jar $SWITCHES
|
$JAVACMD $JAVA_OPTIONS -jar "$INSTALL_DIR/launcher.jar" $SWITCHES
|
||||||
|
|
Loading…
Add table
Reference in a new issue