Updated Branches: refs/heads/trunk c688915e8 -> 49c0bf9b2
SQOOP-1260: HADOOP_MAPRED_HOME should be defaulted correctly (Venkat Ranganathan via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/49c0bf9b Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/49c0bf9b Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/49c0bf9b Branch: refs/heads/trunk Commit: 49c0bf9b2e654eb36a4dabd989c470788c7e9ed8 Parents: c688915 Author: Jarek Jarcec Cecho <[email protected]> Authored: Thu Dec 19 14:43:45 2013 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Thu Dec 19 14:43:45 2013 -0800 ---------------------------------------------------------------------- bin/configure-sqoop | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/49c0bf9b/bin/configure-sqoop ---------------------------------------------------------------------- diff --git a/bin/configure-sqoop b/bin/configure-sqoop index c042e7c..4dd2690 100755 --- a/bin/configure-sqoop +++ b/bin/configure-sqoop @@ -51,12 +51,12 @@ if [ -z "${HADOOP_COMMON_HOME}" ]; then fi fi fi + if [ -z "${HADOOP_MAPRED_HOME}" ]; then - if [ -n "${HADOOP_HOME}" ]; then - HADOOP_MAPRED_HOME=${HADOOP_HOME} - else - if [ -d "/usr/lib/hadoop-mapreduce" ]; then - HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce + HADOOP_MAPRED_HOME=/usr/lib/hadoop-mapreduce + if [ ! -d "${HADOOP_MAPRED_HOME}" ]; then + if [ -n "${HADOOP_HOME}" ]; then + HADOOP_MAPRED_HOME=${HADOOP_HOME} else HADOOP_MAPRED_HOME=${SQOOP_HOME}/../hadoop-mapreduce fi
