[jboss-cvs] JBossAS SVN: r101675 - trunk/main/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2010-03-01 12:03:30 -0500 (Mon, 01 Mar 2010)
New Revision: 101675

Modified:
   trunk/main/src/bin/run.sh
Log:
Use shell variable substitutions instead if/then

Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2010-03-01 16:51:00 UTC (rev 101674)
+++ trunk/main/src/bin/run.sh	2010-03-01 17:03:30 UTC (rev 101675)
@@ -86,44 +86,39 @@
             MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc`
         fi
 
-	if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
-	    # use the system max
-	    MAX_FD="$MAX_FD_LIMIT"
-	fi
+    if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
+        # use the system max
+        MAX_FD="$MAX_FD_LIMIT"
+    fi
 
-	ulimit -n $MAX_FD
-	if [ "$?" -ne 0 ]; then
-	    warn "Could not set maximum file descriptor limit: $MAX_FD"
-	fi
+    ulimit -n $MAX_FD
+    if [ "$?" -ne 0 ]; then
+        warn "Could not set maximum file descriptor limit: $MAX_FD"
+    fi
     else
-	warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
+        warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
     fi
 fi
 
 # Setup the JVM
 if [ "x$JAVA" = "x" ]; then
     if [ "x$JAVA_HOME" != "x" ]; then
-	JAVA="$JAVA_HOME/bin/java"
+        JAVA="$JAVA_HOME/bin/java"
     else
-	JAVA="java"
+        JAVA="java"
     fi
 fi
 
 # Setup the classpath
-runjar="$JBOSS_HOME/bin/run.jar"
-if [ ! -f "$runjar" ]; then
-    die "Missing required file: $runjar"
+JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/run.jar"
+if [ ! -f "$JBOSS_BOOT_CLASSPATH" ]; then
+    die "Missing required file: $JBOSS_BOOT_CLASSPATH"
 fi
-JBOSS_BOOT_CLASSPATH="$runjar"
 
 # Tomcat uses the JDT Compiler
 # Only include tools.jar if someone wants to use the JDK instead.
 # compatible distribution which JAVA_HOME points to
-if [ "x$JAVAC_JAR" = "x" ]; then
-    JAVAC_JAR_FILE="$JAVA_HOME/lib/tools.jar"
-else
-    JAVAC_JAR_FILE="$JAVAC_JAR"
-fi
+JAVAC_JAR_FILE="${JAVAC_JAR:-$JAVA_HOME/lib/tools.jar}"
 if [ ! -f "$JAVAC_JAR_FILE" ]; then
    # MacOSX does not have a seperate tools.jar
    if [ "$darwin" != "true" -a "x$JAVAC_JAR" != "x" ]; then
@@ -133,14 +128,10 @@
    JAVAC_JAR_FILE=
 fi
 
-if [ "x$JBOSS_CLASSPATH" = "x" ]; then
-    JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
-else
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH"
-fi
-if [ "x$JAVAC_JAR_FILE" != "x" ]; then
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR_FILE"
-fi
+# Setup classpath 
+JBOSS_CLASSPATH="${JBOSS_CLASSPATH:+$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH}"
+JBOSS_CLASSPATH="${JBOSS_CLASSPATH:-$JBOSS_BOOT_CLASSPATH}"
+JBOSS_CLASSPATH="$JBOSS_CLASSPATH${JAVAC_JAR_FILE:+:$JAVAC_JAR_FILE}"
 
 # If -server not set in JAVA_OPTS, set it, if supported
 SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
@@ -148,7 +139,7 @@
 
     # Check for SUN(tm) JVM w/ HotSpot support
     if [ "x$HAS_HOTSPOT" = "x" ]; then
-	HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+    HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
     fi
 
     # Check for OpenJDK JVM w/server support
@@ -158,13 +149,17 @@
 
     # Enable -server if we have Hotspot or OpenJDK, unless we can't
     if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" ]; then
-	# MacOS does not support -server flag
-	if [ "$darwin" != "true" ]; then
-	    JAVA_OPTS="-server $JAVA_OPTS"
-	fi
+        # MacOS does not support -server flag
+        if [ "$darwin" != "true" ]; then
+            JAVA_OPTS="-server $JAVA_OPTS"
+        fi
     fi
 fi
 
+# Setup JBoss specific properties
+JAVA_OPTS="${JAVA_OPTS:+$JAVA_OPTS -Dprogram.name=$PROGNAME}"
+JAVA_OPTS="${JAVA_OPTS:--Dprogram.name=$PROGNAME}"
+
 # Setup JBoss Native library path
 #
 if [ -d "$JBOSS_HOME/../native/lib" ]; then
@@ -192,24 +187,13 @@
         else
             JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
         fi
-        if [ "x$LD_LIBRARY_PATH" = "x" ]; then
-          LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
-        else
-          LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
-        fi
+        LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
         export LD_LIBRARY_PATH
         JBOSS_NATIVE_LIBPATH=$LD_LIBRARY_PATH
     fi
-    if [ "x$JAVA_OPTS" = "x" ]; then
-        JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_LIBPATH"
-    else
-        JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_LIBPATH"
-    fi
+    JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_LIBPATH"
 fi
 
-# Setup JBoss specific properties
-JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-
 # Setup the java endorsed dirs
 JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"