Author: bmahe
Date: Wed Oct 26 22:54:30 2011
New Revision: 1189521
URL: http://svn.apache.org/viewvc?rev=1189521&view=rev
Log:
BIGTOP-188. All of Whirr wrapper scripts and init.d scripts need to start
include find-java code from bigtop-utils
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh?rev=1189521&r1=1189520&r2=1189521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/whirr/install_whirr.sh
Wed Oct 26 22:54:30 2011
@@ -108,6 +108,13 @@ install -d -m 0755 $BIN_DIR
cat > $BIN_DIR/whirr <<EOF
#!/bin/sh
+# 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/whirr "\$@"
EOF
chmod 755 $BIN_DIR/whirr
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control?rev=1189521&r1=1189520&r2=1189521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/control Wed Oct 26
22:54:30 2011
@@ -22,6 +22,7 @@ Homepage: http://incubator.apache.org/wh
Package: whirr
Architecture: all
+Depends: bigtop-utils
Description: Scripts and libraries for running software services on cloud
infrastructure
Whirr provides
.
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1189521&r1=1189520&r2=1189521&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Wed
Oct 26 22:54:30 2011
@@ -37,6 +37,7 @@ Source0: %{name}-%{whirr_base_version}-i
Source1: do-component-build
Source2: install_%{name}.sh
Source3: whirr.1
+Requires: bigtop-utils
%description
Whirr provides
@@ -67,5 +68,5 @@ bash %{SOURCE2} \
%defattr(-,root,root)
%attr(0755,root,root) %{lib_whirr}
%attr(0755,root,root) %{_bindir}/%{name}
-%doc %attr(0644,root,root) %{man_dir}/man1/whirr.1.gz
+%doc %attr(0644,root,root) %{man_dir}/man1/whirr.1.*
%doc %{doc_whirr}
