You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/07/13 02:24:13 UTC

svn commit: r963539 - in /hbase/trunk: CHANGES.txt bin/hbase bin/hbase-config.sh bin/hbase-daemon.sh bin/hbase-daemons.sh bin/regionservers.sh bin/start-hbase.sh bin/stop-hbase.sh bin/zookeepers.sh

Author: stack
Date: Tue Jul 13 00:24:12 2010
New Revision: 963539

URL: http://svn.apache.org/viewvc?rev=963539&view=rev
Log:
HBASE-2831 Fix '' path duplication in setup scripts

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/bin/hbase
    hbase/trunk/bin/hbase-config.sh
    hbase/trunk/bin/hbase-daemon.sh
    hbase/trunk/bin/hbase-daemons.sh
    hbase/trunk/bin/regionservers.sh
    hbase/trunk/bin/start-hbase.sh
    hbase/trunk/bin/stop-hbase.sh
    hbase/trunk/bin/zookeepers.sh

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jul 13 00:24:12 2010
@@ -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

Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Tue Jul 13 00:24:12 2010
@@ -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

Modified: hbase/trunk/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-config.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-config.sh (original)
+++ hbase/trunk/bin/hbase-config.sh Tue Jul 13 00:24:12 2010
@@ -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

Modified: hbase/trunk/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-daemon.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-daemon.sh (original)
+++ hbase/trunk/bin/hbase-daemon.sh Tue Jul 13 00:24:12 2010
@@ -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
 

Modified: hbase/trunk/bin/hbase-daemons.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-daemons.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-daemons.sh (original)
+++ hbase/trunk/bin/hbase-daemons.sh Tue Jul 13 00:24:12 2010
@@ -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
 

Modified: hbase/trunk/bin/regionservers.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/regionservers.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/regionservers.sh (original)
+++ hbase/trunk/bin/regionservers.sh Tue Jul 13 00:24:12 2010
@@ -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
 

Modified: hbase/trunk/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/start-hbase.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/start-hbase.sh (original)
+++ hbase/trunk/bin/start-hbase.sh Tue Jul 13 00:24:12 2010
@@ -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
 

Modified: hbase/trunk/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/stop-hbase.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/stop-hbase.sh (original)
+++ hbase/trunk/bin/stop-hbase.sh Tue Jul 13 00:24:12 2010
@@ -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
 

Modified: hbase/trunk/bin/zookeepers.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/zookeepers.sh?rev=963539&r1=963538&r2=963539&view=diff
==============================================================================
--- hbase/trunk/bin/zookeepers.sh (original)
+++ hbase/trunk/bin/zookeepers.sh Tue Jul 13 00:24:12 2010
@@ -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