From 90f564b2ff7d7c53256fbcb04aaac292faf05702 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 7 May 2010 15:16:50 +0000
Subject: QPID-2491 : Committed patch provided by Sorin Suciu to remove
 readlink from the broker start script making it cross platform
 (Darwin,Solaris)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@942119 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/broker/bin/qpid-passwd | 6 +++---
 qpid/java/broker/bin/qpid-server | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
index b84580da60..f432e00ab8 100755
--- a/qpid/java/broker/bin/qpid-passwd
+++ b/qpid/java/broker/bin/qpid-passwd
@@ -18,9 +18,9 @@
 # under the License.
 #
 
+WHEREAMI=`dirname $0`
 if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
+    export QPID_HOME=`cd $WHEREAMI/../ && pwd`
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
@@ -32,4 +32,4 @@ export JAVA=java \
        JAVA_MEM=-Xmx1024m \
        QPID_CLASSPATH=$QPID_LIBS
 
-. qpid-run org.apache.qpid.tools.security.Passwd "$@"
+. ${QPID_HOME}/bin/qpid-run org.apache.qpid.tools.security.Passwd "$@"
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index 4e11fd5fe7..0b0dd41169 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -17,10 +17,9 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
+WHEREAMI=`dirname $0`
 if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
+    export QPID_HOME=`cd $WHEREAMI/../ && pwd`
 fi
 
 # Set classpath to include Qpid jar with all required jars in manifest
@@ -36,4 +35,4 @@ export JAVA=java \
 
 QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG_APPEND"
 
-. qpid-run org.apache.qpid.server.Main "$@"
+. ${QPID_HOME}/bin/qpid-run org.apache.qpid.server.Main "$@"
-- 
cgit v1.2.1