HBASE-2831 Fix '' path duplication in setup scripts

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

CHANGES.txt

@@ -430,6 +430,8 @@ Release 0.21.0 - Unreleased
                (Benoit Sigoure via Stack)
    HBASE-2806  (small compile fix via jgray)
    HBASE-2797  Another NPE in ReadWriteConsistencyControl
+   HBASE-2831  Fix '$bin' path duplication in setup scripts
+               (Nicolas Spiegelberg via Stack)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

bin/hbase

@@ -43,7 +43,7 @@
 #   MAVEN_HOME       Where mvn is installed.
 #
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 # This will set HBASE_HOME, etc.
 . "$bin"/hbase-config.sh

bin/hbase-config.sh

@@ -40,7 +40,7 @@ done
 # convert relative path to absolute path
 bin=`dirname "$this"`
 script=`basename "$this"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 this="$bin/$script"
 
 # the root of the hbase installation

bin/hbase-daemon.sh

@@ -43,7 +43,7 @@ if [ $# -le 1 ]; then
 fi
 
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh
 

bin/hbase-daemons.sh

@@ -33,7 +33,7 @@ if [ $# -le 1 ]; then
 fi
 
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 . $bin/hbase-config.sh
 

bin/regionservers.sh

@@ -42,7 +42,7 @@ if [ $# -le 0 ]; then
 fi
 
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh
 

bin/start-hbase.sh

@@ -27,7 +27,7 @@
 usage="Usage: start-hbase.sh"
 
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh
 

bin/stop-hbase.sh

@@ -25,7 +25,7 @@
 # Stop hadoop hbase daemons.  Run this on master node.
 
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh
 

bin/zookeepers.sh

@@ -39,7 +39,7 @@ if [ $# -le 0 ]; then
 fi
 
 bin=`dirname "$0"`
-bin=`cd "$bin"; pwd`
+bin=`cd "$bin">/dev/null; pwd`
 
 . "$bin"/hbase-config.sh