HADOOP-6630. hadoop-config.sh fails to get executed if hadoop wrapper scripts are in path. Contributed by Allen Wittenauer.

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

CHANGES.txt

@@ -382,6 +382,9 @@ Trunk (unreleased changes)
     HADOOP-6709. Re-instate deprecated FileSystem methods that were removed
     after 0.20. (tomwhite)
  
+    HADOOP-6630. hadoop-config.sh fails to get executed if hadoop wrapper
+    scripts are in path. (Allen Wittenauer via tomwhite)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

bin/hadoop-config.sh

@@ -19,7 +19,7 @@
 
 # resolve links - $0 may be a softlink
 
-this="$0"
+this="${BASH_SOURCE-$0}"
 while [ -h "$this" ]; do
   ls=`ls -ld "$this"`
   link=`expr "$ls" : '.*-> \(.*\)$'`

bin/hadoop-daemon.sh

@@ -36,7 +36,7 @@ if [ $# -le 1 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hadoop-config.sh

bin/hadoop-daemons.sh

@@ -26,7 +26,7 @@ if [ $# -le 1 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . $bin/hadoop-config.sh

bin/rcc

@@ -27,7 +27,7 @@
 #   HADOOP_CONF_DIR  Alternate conf dir. Default is ${HADOOP_HOME}/conf.
 #
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hadoop-config.sh

bin/slaves.sh

@@ -35,7 +35,7 @@ if [ $# -le 0 ]; then
   exit 1
 fi
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hadoop-config.sh

bin/start-all.sh

@@ -20,7 +20,7 @@
 
 echo "This script is Deprecated. Instead use start-dfs.sh and start-mapred.sh"
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hadoop-config.sh

bin/start-balancer.sh

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hdfs-config.sh

bin/start-dfs.sh

@@ -22,7 +22,7 @@
 
 usage="Usage: start-dfs.sh [-upgrade|-rollback]"
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hdfs-config.sh

bin/start-mapred.sh

@@ -18,7 +18,7 @@
 
 # Start hadoop map reduce daemons.  Run this on master node.
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . $bin/mapred-config.sh

bin/stop-all.sh

@@ -20,7 +20,7 @@
 
 echo "This script is Deprecated. Instead use stop-dfs.sh and stop-mapred.sh"
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hadoop-config.sh

bin/stop-balancer.sh

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hdfs-config.sh

bin/stop-dfs.sh

@@ -18,7 +18,7 @@
 
 # Stop hadoop DFS daemons.  Run this on master node.
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . "$bin"/hdfs-config.sh

bin/stop-mapred.sh

@@ -18,7 +18,7 @@
 
 # Stop hadoop map reduce daemons.  Run this on master node.
 
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
 . $bin/mapred-config.sh