Have launch.sh running in the work directory

git-svn-id: https://svn.argeo.org/slc/trunk@3608 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.launcher/src/main/base/launch.bat b/runtime/org.argeo.slc.launcher/src/main/base/launch.bat
index 7f4599080da593adfc6455ec48b1ebee1f6dd0e5..0b83842952ec4cf8c14872d9613ec447444d7ed3 100644 (file)
--- a/runtime/org.argeo.slc.launcher/src/main/base/launch.bat
+++ b/runtime/org.argeo.slc.launcher/src/main/base/launch.bat
@@ -1,9 +1,10 @@
 @echo off\r
 set ROOT_DIR=%~dp0\r
+set LIB_DIR=%ROOT_DIR%\lib\r
 set WORK_DIR=%ROOT_DIR%\work\%1\r
 \r
 TITLE %1\r
 \r
 cd %WORK_DIR%\r
 \r
-java %JAVA_OPTS% -jar "%ROOT_DIR%\lib\org.eclipse.osgi-${version.equinox}.jar" -clean -console -configuration "%WORK_DIR%\conf" -data "%WORK_DIR%\data"
\ No newline at end of file
+java %JAVA_OPTS% -jar "%LIB_DIR%\lib\org.eclipse.osgi-${version.equinox}.jar" -clean -console -configuration "%WORK_DIR%\conf" -data "%WORK_DIR%\data"
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.launcher/src/main/base/launch.sh b/runtime/org.argeo.slc.launcher/src/main/base/launch.sh
index fa3697435a2fa510e0f038ee7c7d48fcb1ebd0e0..ead337f32194aa481f88c35ca6ec623dfc699cd8 100644 (file)
--- a/runtime/org.argeo.slc.launcher/src/main/base/launch.sh
+++ b/runtime/org.argeo.slc.launcher/src/main/base/launch.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 INSTANCE=$1
 
+ROOT_DIR=`pwd`
+LIB_DIR=$ROOT_DIR/lib
+
 # Defaults
 if [ -z "$INSTANCE" ]; then
        INSTANCE=agent
@@ -8,13 +11,14 @@ fi
 
 echo "Using configuration: $INSTANCE" 
 
-WORK_DIR=work/$INSTANCE
+WORK_DIR=$ROOT_DIR/work/$INSTANCE
 if [ -z "$JAVA_OPTS" ]; then
        JAVA_OPTS=-Xmx256m
 fi
 
 if [ -d "$WORK_DIR" ]; then
-java $JAVA_OPTS -jar lib/org.eclipse.osgi-${version.equinox}.jar \
+cd $WORK_DIR
+java $JAVA_OPTS -jar $LIB_DIR/org.eclipse.osgi-${version.equinox}.jar \
        -clean -console \
        -configuration $WORK_DIR/conf \
        -data $WORK_DIR/data