Author: rvs
Date: Wed Mar 21 22:18:22 2012
New Revision: 1303603
URL: http://svn.apache.org/viewvc?rev=1303603&view=rev
Log:
BIGTOP-477. launcher script for pig, hive, sqoop and mahout should not source
/etc/default/hadoop anymore
Removed:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/install_hive.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/install_mahout.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/install_pig.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/install_hive.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/install_hive.sh?rev=1303603&r1=1303602&r2=1303603&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/install_hive.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/install_hive.sh
Wed Mar 21 22:18:22 2012
@@ -119,7 +119,6 @@ do
wrapper=$BIN_DIR/$file
cat >>$wrapper <<EOF
#!/bin/sh
-. /etc/default/hadoop
# Autodetect JAVA_HOME if not defined
if [ -e /usr/libexec/bigtop-detect-javahome ]; then
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/install_mahout.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/install_mahout.sh?rev=1303603&r1=1303602&r2=1303603&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/install_mahout.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/mahout/install_mahout.sh
Wed Mar 21 22:18:22 2012
@@ -122,7 +122,6 @@ cp -a ${BUILD_DIR}/examples/ $PREFIX/$DO
install -d -m 0755 $PREFIX/$BIN_DIR
cat > $PREFIX/$BIN_DIR/mahout <<EOF
#!/bin/sh
-. /etc/default/hadoop
# Autodetect JAVA_HOME if not defined
if [ -e /usr/libexec/bigtop-detect-javahome ]; then
@@ -131,6 +130,10 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
. /usr/lib/bigtop-utils/bigtop-detect-javahome
fi
+# FIXME: MAHOUT-994
+export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
+export HADOOP_CONF_DIR=\${HADOOP_CONF_DIR:-/etc/hadoop/conf}
+
export MAHOUT_HOME=\${MAHOUT_HOME:-$INSTALLED_LIB_DIR}
export MAHOUT_CONF_DIR=\${MAHOUT_CONF_DIR:-$CONF_DIR}
# FIXME: the following line is a workaround for BIGTOP-259
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/install_pig.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/install_pig.sh?rev=1303603&r1=1303602&r2=1303603&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/install_pig.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/pig/install_pig.sh
Wed Mar 21 22:18:22 2012
@@ -120,7 +120,6 @@ ln -s /etc/pig/conf $LIB_DIR/conf
install -d -m 0755 $BIN_DIR
cat > $BIN_DIR/pig <<EOF
#!/bin/sh
-. /etc/default/hadoop
# Autodetect JAVA_HOME if not defined
if [ -e /usr/libexec/bigtop-detect-javahome ]; then
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1303603&r1=1303602&r2=1303603&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/sqoop/install_sqoop.sh
Wed Mar 21 22:18:22 2012
@@ -137,7 +137,6 @@ for i in sqoop sqoop-codegen sqoop-expor
mkdir -p `dirname $wrapper`
cat > $wrapper <<EOF
#!/bin/sh
-. /etc/default/hadoop
# Autodetect JAVA_HOME if not defined
if [ -e /usr/libexec/bigtop-detect-javahome ]; then
