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

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

Author: jfrederic.clere at jboss.com
Date: 2009-09-17 06:36:08 -0400 (Thu, 17 Sep 2009)
New Revision: 93635

Modified:
   trunk/main/src/bin/run.sh
Log:
Allow bin/native location (from the .org to work here).


Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2009-09-17 10:22:29 UTC (rev 93634)
+++ trunk/main/src/bin/run.sh	2009-09-17 10:36:08 UTC (rev 93635)
@@ -161,18 +161,26 @@
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd`
 elif [ -d "$JBOSS_HOME/native/bin" ]; then
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
+elif [ -d "$JBOSS_HOME/bin/native" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/bin/native" && pwd`
 fi
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin; then
-        JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
+        if [ -d "$JBOSS_NATIVE_DIR/bin" ]; then
+            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
+        fi
         export PATH="$JBOSS_NATIVE_DIR:$PATH"
         JBOSS_NATIVE_LIBPATH=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
         IS_64_BIT_JVM=`"$JAVA" -version 2>&1 | $GREP -i 64-bit`
         if [ "x$IS_64_BIT_JVM" != "x" ]; then
-            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
+            if [ -d "$JBOSS_NATIVE_DIR/lib64" ]; then
+                JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
+            fi
         else
-            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
+            if [ -d "$JBOSS_NATIVE_DIR/lib64" ]; then
+                JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
+            fi
         fi
         if [ "x$LD_LIBRARY_PATH" = "x" ]; then
           LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"