Author: bmahe
Date: Wed Oct 26 22:38:04 2011
New Revision: 1189510
URL: http://svn.apache.org/viewvc?rev=1189510&view=rev
Log:
BIGTOP-171. All of Pig wrapper scripts and init.d scripts need to start include
find-java code from bigtop-utils
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh?rev=1189510&r1=1189509&r2=1189510&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh Wed
Oct 26 22:38:04 2011
@@ -120,7 +120,15 @@ ln -s /etc/pig/conf $LIB_DIR/conf
install -d -m 0755 $BIN_DIR
cat > $BIN_DIR/pig <<EOF
#!/bin/sh
-. /etc/default/hadoop
+source /etc/default/hadoop
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
exec $INSTALLED_LIB_DIR/bin/pig "\$@"
EOF
chmod 755 $BIN_DIR/pig
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control?rev=1189510&r1=1189509&r2=1189510&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control Wed Oct 26
22:38:04 2011
@@ -8,7 +8,7 @@ Homepage: http://hadoop.apache.org/pig/
Package: hadoop-pig
Architecture: all
-Depends: hadoop
+Depends: hadoop, bigtop-utils
Description: A platform for analyzing large data sets using Hadoop
Pig is a platform for analyzing large data sets that consists of a high-level
language
for expressing data analysis programs, coupled with infrastructure for
evaluating these
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1189510&r1=1189509&r2=1189510&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Wed Oct
26 22:38:04 2011
@@ -82,7 +82,7 @@ Source2: install_pig.sh
Source3: log4j.properties
Source4: pig.1
Source5: pig.properties
-Requires: hadoop
+Requires: hadoop, bigtop-utils
%description
Pig is a platform for analyzing large data sets that consists of a high-level
language
