From 00ed966728f899cb5be1bdd7fea51158965d0f1f Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Tue, 13 Jul 2010 00:24:12 +0000
Subject: [PATCH] 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          | 2 ++
 bin/hbase            | 2 +-
 bin/hbase-config.sh  | 2 +-
 bin/hbase-daemon.sh  | 2 +-
 bin/hbase-daemons.sh | 2 +-
 bin/regionservers.sh | 2 +-
 bin/start-hbase.sh   | 2 +-
 bin/stop-hbase.sh    | 2 +-
 bin/zookeepers.sh    | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d5d6188030d..e5188b6d74a 100644
--- a/CHANGES.txt
+++ b/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
diff --git a/bin/hbase b/bin/hbase
index 0f3657aa86a..eee4c2b96ea 100755
--- a/bin/hbase
+++ b/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
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index 0142daf5487..86b1a3a159e 100644
--- a/bin/hbase-config.sh
+++ b/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
diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh
index 42bb0863b3a..643b54f9487 100755
--- a/bin/hbase-daemon.sh
+++ b/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
 
diff --git a/bin/hbase-daemons.sh b/bin/hbase-daemons.sh
index d6aae04ba22..154ada7093a 100755
--- a/bin/hbase-daemons.sh
+++ b/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
 
diff --git a/bin/regionservers.sh b/bin/regionservers.sh
index 2ae187882ed..46cf11bc447 100755
--- a/bin/regionservers.sh
+++ b/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
 
diff --git a/bin/start-hbase.sh b/bin/start-hbase.sh
index a5c538ee9c4..c0b2e93afc1 100755
--- a/bin/start-hbase.sh
+++ b/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
 
diff --git a/bin/stop-hbase.sh b/bin/stop-hbase.sh
index 0533318ebc6..2b397a0bec9 100755
--- a/bin/stop-hbase.sh
+++ b/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
 
diff --git a/bin/zookeepers.sh b/bin/zookeepers.sh
index f9cffc27d2d..54759dc697a 100755
--- a/bin/zookeepers.sh
+++ b/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