Logging and scripting fine-tuning

[aquarium] / scripts / aquarium.sh

diff --git a/scripts/aquarium.sh b/scripts/aquarium.sh
index 4244992..96ab8b1 100755 (executable)
--- a/scripts/aquarium.sh
+++ b/scripts/aquarium.sh
@@ -72,6 +72,8 @@ PRGDIR=`dirname "$PRG"`
 [ -z "$AQUARIUM_OPTS" ] && AQUARIUM_OPTS=""
 [ -z "$JAVA_OPTS" ]     && JAVA_OPTS="-Xms1024M -Xmx4096M"
 
+JAVA_OPTS="$JAVA_OPTS -DAQUARIUM_HOME=$AQUARIUM_HOME"
+
 export AQUARIUM_HOME
 
 PID=$AQUARIUM_HOME/bin/aquarium.pid
@@ -126,9 +128,9 @@ start() {
     echo "Using MAIN $AQUARIUM_MAIN_CLASS"
     echo "Using AQUARIUM_PROP $AQUARIUM_PROP"
     echo "Using JAVA_OPTS $JAVA_OPTS"
-    echo "nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -debug -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE"
+    echo "nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE"
 
-    nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -debug -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE 2>&1 &
+    nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE 2>&1 &
     echo $! > $PID
     echo "OK [pid = "`cat $PID`"]"
 }