HADOOP-7356. RPM packages broke bin/hadoop script in developer environment. Contributed by Eric Yang.

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

CHANGES.txt

@@ -283,6 +283,9 @@ Trunk (unreleased changes)
     HADOOP-7353. Cleanup FsShell and prevent masking of RTE stack traces.
     (Daryn Sharp via todd)
 
+    HADOOP-7356. RPM packages broke bin/hadoop script in developer environment.
+    (Eric Yang via todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

bin/hadoop

@@ -21,7 +21,11 @@ bin=`which $0`
 bin=`dirname ${bin}`
 bin=`cd "$bin"; pwd`
  
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin"/hadoop-config.sh
+fi
 
 function print_usage(){
   echo "Usage: hadoop [--config confdir] COMMAND"

bin/hadoop-daemon.sh

@@ -39,7 +39,11 @@ fi
 bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin"/hadoop-config.sh
+fi
 
 # get arguments
 

bin/hadoop-daemons.sh

@@ -29,6 +29,10 @@ fi
 bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
-. $bin/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+  . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin"/hadoop-config.sh
+fi
 
 exec "$bin/slaves.sh" --config $HADOOP_CONF_DIR cd "$HADOOP_PREFIX" \; "$bin/hadoop-daemon.sh" --config $HADOOP_CONF_DIR "$@"

bin/slaves.sh

@@ -38,7 +38,11 @@ fi
 bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin"/hadoop-config.sh
+fi
 
 if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
   . "${HADOOP_CONF_DIR}/hadoop-env.sh"

bin/start-all.sh

@@ -23,7 +23,11 @@ echo "This script is Deprecated. Instead use start-dfs.sh and start-mapred.sh"
 bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin"/hadoop-config.sh
+fi
 
 # start hdfs daemons if hdfs is present
 if [ -f "${HADOOP_HDFS_HOME}"/bin/start-dfs.sh ]; then

bin/stop-all.sh

@@ -23,7 +23,11 @@ echo "This script is Deprecated. Instead use stop-dfs.sh and stop-mapred.sh"
 bin=`dirname "${BASH_SOURCE-$0}"`
 bin=`cd "$bin"; pwd`
 
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
   . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin"/hadoop-config.sh
+fi
 
 # stop hdfs daemons if hdfs is present
 if [ -f "${HADOOP_HDFS_HOME}"/bin/stop-dfs.sh ]; then