ZOOKEEPER-303. Bin scripts dont work on a Mac. (tom white via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@743050 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -7,7 +7,8 @@ BUGFIXES:
 Backward compatibile changes:
 
 BUGFIXES: 
-
+  ZOOKEEPER-303. Bin scripts dont work on a Mac. (tom white via mahadev)
+ 
 IMPROVEMENTS:
 
 NEW FEATURES:

bin/zkCleanup.sh

@@ -25,7 +25,13 @@
 # relative to the canonical path of this script.
 #
 
-ZOOBIN=`readlink -f "$0"`
+# Only follow symlinks if readlink supports it
+if readlink -f "$0" > /dev/null 2>&1
+then
+  ZOOBIN=`readlink -f "$0"`
+else
+  ZOOBIN="$0"
+fi
 ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . $ZOOBINDIR/zkEnv.sh

bin/zkCli.sh

@@ -25,7 +25,13 @@
 # relative to the canonical path of this script.
 #
 
-ZOOBIN=`readlink -f "$0"`
+# Only follow symlinks if readlink supports it
+if readlink -f "$0" > /dev/null 2>&1
+then
+  ZOOBIN=`readlink -f "$0"`
+else
+  ZOOBIN="$0"
+fi
 ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . $ZOOBINDIR/zkEnv.sh

bin/zkServer.sh

@@ -42,7 +42,13 @@ else
     ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
 fi
 
-ZOOBIN=`readlink -f "$0"`
+# Only follow symlinks if readlink supports it
+if readlink -f "$0" > /dev/null 2>&1
+then
+  ZOOBIN=`readlink -f "$0"`
+else
+  ZOOBIN="$0"
+fi
 ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . $ZOOBINDIR/zkEnv.sh