[pkg-jboss-commits] cvs commit to jboss3/debian by agx
pkg-jboss-commits@lists.alioth.debian.org
pkg-jboss-commits@lists.alioth.debian.org
Fri, 18 Jun 2004 06:47:35 -0600
Update of /cvsroot/pkg-jboss/jboss3/debian
In directory haydn:/tmp/cvs-serv29717/debian
Modified Files:
jboss3.init
Log Message:
cleanup
Index: jboss3.init
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jboss3.init 18 Jun 2004 07:45:57 -0000 1.6
+++ jboss3.init 18 Jun 2004 12:47:32 -0000 1.7
@@ -31,7 +31,7 @@
# defined in $DEFAULT
JDK_DIRS="/usr/lib/j2sdk1.4 /usr/lib/j2se/1.4"
-# Include jboss defaults if available
+# include jboss defaults if available
if [ -f $DEFAULT ] ; then
. $DEFAULT
fi
@@ -55,10 +55,13 @@
done
export JAVA_HOME
-[ ! -z "$JAVA_OPTS" ] && export $JAVA_OPTS
+# export JAVA_OPTS if set
+[ -n "$JAVA_OPTS" ] && export JAVA_OPTS
+# use specific config if set, default otherwise
[ -n "$JBOSS_SERVER" ] && STARTUP_OPTS="-c $JBOSS_SERVER"
+# use JBOSS_OPTS if set
[ -n "$JBOSS_OPTS" ] && STARTUP_OPTS="$STARTUP_OPTS $JBOSS_OPTS"
JBOSS_START="$JBOSS_HOME/bin/run.sh"