svn commit: r1381900 - in /zookeeper/trunk: CHANGES.txt bin/zkEnv.sh bin/zkServer.sh

[ma...@apache.org]

Author: mahadev
Date: Fri Sep  7 06:22:05 2012
New Revision: 1381900

URL: http://svn.apache.org/viewvc?rev=1381900&view=rev
Log:
ZOOKEEPER-1538. Improve space handling in zkServer.sh and zkEnv.sh. (Andrew Ferguson via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/bin/zkEnv.sh
    zookeeper/trunk/bin/zkServer.sh

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1381900&r1=1381899&r2=1381900&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Sep  7 06:22:05 2012
@@ -240,6 +240,9 @@ BUGFIXES:
   ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items properly from
   the watch list. (Botond Hejj via mahadev)
 
+  ZOOKEEPER-1538. Improve space handling in zkServer.sh and zkEnv.sh. (Andrew
+  Ferguson via mahadev)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/bin/zkEnv.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkEnv.sh?rev=1381900&r1=1381899&r2=1381900&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkEnv.sh (original)
+++ zookeeper/trunk/bin/zkEnv.sh Fri Sep  7 06:22:05 2012
@@ -76,7 +76,7 @@ do
 done
 
 #make it work in the binary package
-if [ -e ${ZOOKEEPER_PREFIX}/share/zookeeper/zookeeper-*.jar ]; then
+if [ -e "${ZOOKEEPER_PREFIX}/share/zookeeper/zookeeper-*.jar" ]; then
   LIBPATH="${ZOOKEEPER_PREFIX}"/share/zookeeper/*.jar
 else
   #release tarball format

Modified: zookeeper/trunk/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.sh?rev=1381900&r1=1381899&r2=1381900&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.sh (original)
+++ zookeeper/trunk/bin/zkServer.sh Fri Sep  7 06:22:05 2012
@@ -44,7 +44,7 @@ fi
 
 # use POSTIX interface, symlink is followed automatically
 ZOOBIN="${BASH_SOURCE-$0}"
-ZOOBIN=`dirname ${ZOOBIN}`
+ZOOBIN=`dirname "${ZOOBIN}"`
 ZOOBINDIR=`cd ${ZOOBIN}; pwd`
 
 if [ -e "$ZOOBIN/../libexec/zkEnv.sh" ]; then
@@ -64,7 +64,7 @@ then
 fi
 
 # if we give a more complicated path to the config, don't screw around in $ZOOCFGDIR
-if [ "x`dirname $ZOOCFG`" != "x$ZOOCFGDIR" ]
+if [ "x`dirname \"$ZOOCFG\"`" != "x$ZOOCFGDIR" ]
 then
     ZOOCFG="$2"
 fi