summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-06-23 16:54:49 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-06-23 16:54:49 +0100
commit551f2512bcb1499b3c3b37ae225b09fc2b17d7e6 (patch)
tree72fa535d4d04d6274f63fb46e487f0910702d51f
parentdee89f754f9a4350dbbebce2aebcfb42ff255390 (diff)
downloadrabbitmq-server-bug26258.tar.gz
More explanation.bug26258
-rwxr-xr-xscripts/rabbitmq-env5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index b7eff421..69d5a9c9 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -15,13 +15,14 @@
## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
##
-## readlink exits with an error if the given argument is
-## not a symlink
+# We set +e here since since our test for "readlink -f" below needs to
+# be able to fail.
set +e
# Determine where this script is really located (if this script is
# invoked from another script, this is the location of the caller)
SCRIPT_PATH="$0"
while [ -h "$SCRIPT_PATH" ] ; do
+ # Determine if readlink -f is supported at all. TODO clean this up.
FULL_PATH=`readlink -f $SCRIPT_PATH 2>/dev/null`
if [ "$?" != "0" ]; then
REL_PATH=`readlink $SCRIPT_PATH`