HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-204@1133525 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -15,6 +15,8 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)
+
     MAPREDUCE-2447. Fix Child.java to set Task.jvmContext sooner to avoid
     corner cases in error handling. (Siddharth Seth via acmurthy) 
 

bin/hadoop-config.sh

@@ -32,7 +32,11 @@ this="$bin/$script"
 
 # the root of the Hadoop installation
 export HADOOP_PREFIX=`dirname "$this"`/..
-export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop
+if [ -d ${HADOOP_PREFIX}/share/hadoop ]; then
+  export HADOOP_HOME=${HADOOP_PREFIX}/share/hadoop
+else
+  export HADOOP_HOME=${HADOOP_PREFIX}
+fi
 
 #check to see if the conf dir is given as an optional argument
 if [ $# -gt 1 ]