Author: mahadev Date: Tue Feb 10 18:39:35 2009 New Revision: 743050 URL: http://svn.apache.org/viewvc?rev=743050&view=rev Log: ZOOKEEPER-303. Bin scripts dont work on a Mac. (tom white via mahadev)
Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/bin/zkCleanup.sh hadoop/zookeeper/trunk/bin/zkCli.sh hadoop/zookeeper/trunk/bin/zkServer.sh Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=743050&r1=743049&r2=743050&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Tue Feb 10 18:39:35 2009 @@ -7,7 +7,8 @@ Backward compatibile changes: BUGFIXES: - + ZOOKEEPER-303. Bin scripts dont work on a Mac. (tom white via mahadev) + IMPROVEMENTS: NEW FEATURES: Modified: hadoop/zookeeper/trunk/bin/zkCleanup.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkCleanup.sh?rev=743050&r1=743049&r2=743050&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkCleanup.sh (original) +++ hadoop/zookeeper/trunk/bin/zkCleanup.sh Tue Feb 10 18:39:35 2009 @@ -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 Modified: hadoop/zookeeper/trunk/bin/zkCli.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkCli.sh?rev=743050&r1=743049&r2=743050&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkCli.sh (original) +++ hadoop/zookeeper/trunk/bin/zkCli.sh Tue Feb 10 18:39:35 2009 @@ -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 Modified: hadoop/zookeeper/trunk/bin/zkServer.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkServer.sh?rev=743050&r1=743049&r2=743050&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkServer.sh (original) +++ hadoop/zookeeper/trunk/bin/zkServer.sh Tue Feb 10 18:39:35 2009 @@ -42,7 +42,13 @@ 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