Author: omalley
Date: Wed Jun 8 19:43:20 2011
New Revision: 1133525
URL: http://svn.apache.org/viewvc?rev=1133525&view=rev
Log:
HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1133525&r1=1133524&r2=1133525&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Wed Jun 8
19:43:20 2011
@@ -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)
Modified: hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh?rev=1133525&r1=1133524&r2=1133525&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh
(original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/hadoop-config.sh Wed
Jun 8 19:43:20 2011
@@ -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 ]
