diff options
Diffstat (limited to 'qpid/java')
| -rwxr-xr-x | qpid/java/broker/bin/qpid-passwd | 6 | ||||
| -rwxr-xr-x | qpid/java/broker/bin/qpid-server | 7 |
2 files changed, 6 insertions, 7 deletions
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 "$@" |