You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/19 04:08:39 UTC
git commit: BIGTOP-463. should we reconsider /usr/lib vs.
/usr/libexec decision? (Sean Mackrory via rvs)
Updated Branches:
refs/heads/master ab10ddf2f -> 2c84ba57c
BIGTOP-463. should we reconsider /usr/lib vs. /usr/libexec decision? (Sean Mackrory via rvs)
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2c84ba57
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2c84ba57
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2c84ba57
Branch: refs/heads/master
Commit: 2c84ba57c9121fc1bf863d0d205ed645adc96015
Parents: ab10ddf
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Mon Feb 18 19:08:14 2013 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Mon Feb 18 19:08:14 2013 -0800
----------------------------------------------------------------------
bigtop-packages/src/common/flume/flume-agent.init | 6 +-----
bigtop-packages/src/common/flume/install_flume.sh | 6 +-----
.../src/common/giraph/install_giraph.sh | 6 +-----
bigtop-packages/src/common/hadoop/init.d.tmpl | 6 +-----
.../src/common/hadoop/install_hadoop.sh | 12 ------------
bigtop-packages/src/common/hbase/install_hbase.sh | 6 +-----
bigtop-packages/src/common/hive/hive.sh | 6 +-----
bigtop-packages/src/common/hive/hive.sh.suse | 6 +-----
bigtop-packages/src/common/hive/install_hive.sh | 6 +-----
.../src/common/mahout/install_mahout.sh | 6 +-----
bigtop-packages/src/common/oozie/install_oozie.sh | 6 +-----
bigtop-packages/src/common/oozie/oozie.init | 6 +-----
bigtop-packages/src/common/pig/install_pig.sh | 6 +-----
bigtop-packages/src/common/solr/install_solr.sh | 6 +-----
bigtop-packages/src/common/sqoop/install_sqoop.sh | 6 +-----
bigtop-packages/src/common/whirr/install_whirr.sh | 6 +-----
.../src/common/zookeeper/install_zookeeper.sh | 12 ++----------
.../src/common/zookeeper/zookeeper-server.sh | 6 +-----
.../src/common/zookeeper/zookeeper-server.sh.suse | 6 +-----
bigtop-packages/src/deb/hbase/service-init.d.tpl | 6 +-----
bigtop-packages/src/deb/hive/service-init.d.tpl | 6 +-----
.../src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec | 2 +-
.../src/rpm/bigtop-utils/SPECS/bigtop-utils.spec | 15 ++++++---------
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 4 +---
bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh | 6 +-----
.../src/rpm/hbase/SOURCES/hbase.sh.suse | 6 +-----
26 files changed, 31 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/flume/flume-agent.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/flume-agent.init b/bigtop-packages/src/common/flume/flume-agent.init
index edb1e3f..1c94aa5 100644
--- a/bigtop-packages/src/common/flume/flume-agent.init
+++ b/bigtop-packages/src/common/flume/flume-agent.init
@@ -38,11 +38,7 @@ if [ -f /etc/default/flume-agent ] ; then
fi
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
STATUS_RUNNING=0
STATUS_DEAD=1
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/flume/install_flume.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/install_flume.sh b/bigtop-packages/src/common/flume/install_flume.sh
index 23ad9e4..e2aa06e 100755
--- a/bigtop-packages/src/common/flume/install_flume.sh
+++ b/bigtop-packages/src/common/flume/install_flume.sh
@@ -123,11 +123,7 @@ cat > $wrapper <<EOF
#!/bin/bash
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
if [ -n "\$FLUME_PID_FILE" ]; then
echo \$$ > \$FLUME_PID_FILE
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/giraph/install_giraph.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/giraph/install_giraph.sh b/bigtop-packages/src/common/giraph/install_giraph.sh
index 68846da..c9d51d0 100644
--- a/bigtop-packages/src/common/giraph/install_giraph.sh
+++ b/bigtop-packages/src/common/giraph/install_giraph.sh
@@ -132,11 +132,7 @@ for i in giraph ; do
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
# Workaround for GIRAPH-199
export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/hadoop/init.d.tmpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/init.d.tmpl b/bigtop-packages/src/common/hadoop/init.d.tmpl
index e5ceaa9..7e3d454 100755
--- a/bigtop-packages/src/common/hadoop/init.d.tmpl
+++ b/bigtop-packages/src/common/hadoop/init.d.tmpl
@@ -161,11 +161,7 @@ if [ -f /etc/default/$DAEMON ] ; then
fi
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
RETVAL_SUCCESS=0
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/hadoop/install_hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index e5e3a36..750fed5 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -172,11 +172,7 @@ for component in $HADOOP_DIR/bin/hadoop $HDFS_DIR/bin/hdfs $YARN_DIR/bin/yarn $M
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
-. /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
. /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
export HADOOP_LIBEXEC_DIR=/${SYSTEM_LIBEXEC_DIR#${PREFIX}}
@@ -268,11 +264,7 @@ cat > $fuse_wrapper << EOF
/sbin/modprobe fuse
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
-. /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
. /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
export HADOOP_HOME=\${HADOOP_HOME:-${HADOOP_DIR#${PREFIX}}}
@@ -284,11 +276,7 @@ export HADOOP_LIBEXEC_DIR=${SYSTEM_LIBEXEC_DIR#${PREFIX}}
if [ "\${LD_LIBRARY_PATH}" = "" ]; then
export JAVA_NATIVE_LIBS="libjvm.so"
- if [ -e /usr/libexec/bigtop-detect-javalibs ]; then
- . /usr/libexec/bigtop-detect-javalibs
- elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javalibs ]; then
. /usr/lib/bigtop-utils/bigtop-detect-javalibs
- fi
export LD_LIBRARY_PATH=\${JAVA_NATIVE_PATH}:/usr/lib
fi
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/hbase/install_hbase.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/install_hbase.sh b/bigtop-packages/src/common/hbase/install_hbase.sh
index 4944e5f..3df001e 100755
--- a/bigtop-packages/src/common/hbase/install_hbase.sh
+++ b/bigtop-packages/src/common/hbase/install_hbase.sh
@@ -138,11 +138,7 @@ cat > $wrapper <<EOF
. /etc/default/hbase
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
export HADOOP_CONF=\${HADOOP_CONF:-/etc/hadoop/conf}
export ZOOKEEPER_HOME=\${ZOOKEEPER_HOME:-/usr/lib/zookeeper}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/hive/hive.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/hive.sh b/bigtop-packages/src/common/hive/hive.sh
index 2488851..ec1b52f 100755
--- a/bigtop-packages/src/common/hive/hive.sh
+++ b/bigtop-packages/src/common/hive/hive.sh
@@ -37,11 +37,7 @@
source /lib/lsb/init-functions
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
RETVAL_SUCCESS=0
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/hive/hive.sh.suse
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/hive.sh.suse b/bigtop-packages/src/common/hive/hive.sh.suse
index a9ed78a..8c202cb 100644
--- a/bigtop-packages/src/common/hive/hive.sh.suse
+++ b/bigtop-packages/src/common/hive/hive.sh.suse
@@ -35,11 +35,7 @@
. /lib/lsb/init-functions
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/hive/install_hive.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/install_hive.sh b/bigtop-packages/src/common/hive/install_hive.sh
index aa89d81..9606b08 100755
--- a/bigtop-packages/src/common/hive/install_hive.sh
+++ b/bigtop-packages/src/common/hive/install_hive.sh
@@ -121,11 +121,7 @@ do
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
#FIXME: workaround for HIVE-2757 (NOTE: HADOOP_HOME is obsolete for Hadoop .23)
export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/mahout/install_mahout.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/mahout/install_mahout.sh b/bigtop-packages/src/common/mahout/install_mahout.sh
index 8b8fd17..7300d1a 100644
--- a/bigtop-packages/src/common/mahout/install_mahout.sh
+++ b/bigtop-packages/src/common/mahout/install_mahout.sh
@@ -124,11 +124,7 @@ cat > $PREFIX/$BIN_DIR/mahout <<EOF
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
# FIXME: MAHOUT-994
export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/oozie/install_oozie.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/install_oozie.sh b/bigtop-packages/src/common/oozie/install_oozie.sh
index 1bd8cfb..6e3a284 100755
--- a/bigtop-packages/src/common/oozie/install_oozie.sh
+++ b/bigtop-packages/src/common/oozie/install_oozie.sh
@@ -137,11 +137,7 @@ cat > ${BIN_DIR}/oozie <<EOF
# limitations under the License.
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
exec /usr/lib/oozie/bin/oozie "\$@"
EOF
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/oozie/oozie.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/oozie.init b/bigtop-packages/src/common/oozie/oozie.init
index a32e6cf..3673ea5 100644
--- a/bigtop-packages/src/common/oozie/oozie.init
+++ b/bigtop-packages/src/common/oozie/oozie.init
@@ -32,11 +32,7 @@
### END INIT INFO
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
is_oozie_alive() {
if [ ! -f "$OOZIE_PID" ]; then
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/pig/install_pig.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/pig/install_pig.sh b/bigtop-packages/src/common/pig/install_pig.sh
index 4dbe6b8..6ac1b96 100644
--- a/bigtop-packages/src/common/pig/install_pig.sh
+++ b/bigtop-packages/src/common/pig/install_pig.sh
@@ -132,11 +132,7 @@ cat > $PREFIX/$BIN_DIR/pig <<EOF
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
# FIXME: a workaround for PIG-2786
# HBase integration support
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/solr/install_solr.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/solr/install_solr.sh b/bigtop-packages/src/common/solr/install_solr.sh
index 45f9c3e..4e09e40 100644
--- a/bigtop-packages/src/common/solr/install_solr.sh
+++ b/bigtop-packages/src/common/solr/install_solr.sh
@@ -153,11 +153,7 @@ cat > $PREFIX/$LIB_DIR/bin/solrd <<EOF
[ -f /etc/default/solr ] && . /etc/default/solr
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
export CATALINA_HOME=$LIB_DIR/../bigtop-tomcat
export CATALINA_BASE=$LIB_DIR/server
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/sqoop/install_sqoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/sqoop/install_sqoop.sh b/bigtop-packages/src/common/sqoop/install_sqoop.sh
index e752c4e..771931a 100755
--- a/bigtop-packages/src/common/sqoop/install_sqoop.sh
+++ b/bigtop-packages/src/common/sqoop/install_sqoop.sh
@@ -139,11 +139,7 @@ for i in sqoop sqoop-codegen sqoop-export sqoop-import-all-tables sqoop-version
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
export SQOOP_HOME=$LIB_DIR
exec $BIN_DIR/$i "\$@"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/whirr/install_whirr.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/whirr/install_whirr.sh b/bigtop-packages/src/common/whirr/install_whirr.sh
index 38208be..aac81e6 100644
--- a/bigtop-packages/src/common/whirr/install_whirr.sh
+++ b/bigtop-packages/src/common/whirr/install_whirr.sh
@@ -103,11 +103,7 @@ cat > $PREFIX/$BIN_DIR/whirr <<EOF
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
exec $INSTALLED_LIB_DIR/bin/whirr "\$@"
EOF
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
index 3929b17..c1f7843 100755
--- a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
+++ b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
@@ -129,11 +129,7 @@ cat > $wrapper <<EOF
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-/usr/lib/zookeeper}
export ZOOKEEPER_CONF=\${ZOOKEEPER_CONF:-/etc/zookeeper/conf}
@@ -150,11 +146,7 @@ for pairs in zkServer.sh/zookeeper-server zkServer-initialize.sh/zookeeper-serve
#!/bin/sh
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
export ZOOPIDFILE=\${ZOOPIDFILE:-/var/run/zookeeper/zookeeper-server.pid}
export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-/usr/lib/zookeeper}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
index fe0664c..bae1d0e 100755
--- a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
+++ b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
@@ -32,11 +32,7 @@
set -e
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON_SCRIPT="/usr/bin/zookeeper-server"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
index d336050..145e362 100644
--- a/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
+++ b/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
@@ -34,11 +34,7 @@
. /lib/lsb/init-functions
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
STATUS_RUNNING=0
STATUS_DEAD=1
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/deb/hbase/service-init.d.tpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hbase/service-init.d.tpl b/bigtop-packages/src/deb/hbase/service-init.d.tpl
index 8abac8c..db9c2b3 100644
--- a/bigtop-packages/src/deb/hbase/service-init.d.tpl
+++ b/bigtop-packages/src/deb/hbase/service-init.d.tpl
@@ -54,11 +54,7 @@ if [ -f /etc/default/hbase ] ; then
fi
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
if [ -z "$HBASE_PID_DIR" -o -z "$HBASE_HOME" ]; then
echo No HBASE_HOME or HBASE_PID_DIR set.
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/deb/hive/service-init.d.tpl
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/service-init.d.tpl b/bigtop-packages/src/deb/hive/service-init.d.tpl
index fa71b6f..6220c59 100644
--- a/bigtop-packages/src/deb/hive/service-init.d.tpl
+++ b/bigtop-packages/src/deb/hive/service-init.d.tpl
@@ -43,11 +43,7 @@
source /lib/lsb/init-functions
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
RETVAL_SUCCESS=0
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec b/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
index dc301ec..87b5926 100644
--- a/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
+++ b/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
@@ -18,7 +18,7 @@
%define bin_jsvc /usr/lib/bigtop-utils
%define doc_jsvc %{_docdir}/%{name}
%else
-%define bin_jsvc %{_libexecdir}/bigtop-utils
+%define bin_jsvc /usr/lib/bigtop-utils
%define doc_jsvc %{_docdir}/%{name}-%{bigtop_jsvc_version}
%endif
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec b/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
index 0e0083d..64c39ba 100644
--- a/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
+++ b/bigtop-packages/src/rpm/bigtop-utils/SPECS/bigtop-utils.spec
@@ -13,10 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# See BIGTOP-383
-%if %{?suse_version:1}%{?mgaversion:1}0
-%define _libexecdir /usr/lib/bigtop-utils/
-%endif
+%define lib_dir /usr/lib/bigtop-utils
Name: bigtop-utils
Version: %{bigtop_utils_version}
@@ -58,10 +55,10 @@ install -p -m 644 %{SOURCE3} .
%install
-install -d -p -m 755 $RPM_BUILD_ROOT%{_libexecdir}/
+install -d -p -m 755 $RPM_BUILD_ROOT%{lib_dir}/
install -d -p -m 755 $RPM_BUILD_ROOT/etc/default
-install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{_libexecdir}/
-install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/
+install -p -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{lib_dir}/
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{lib_dir}/
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/bigtop-utils
%clean
@@ -73,8 +70,8 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%config(noreplace) /etc/default/bigtop-utils
-%{_libexecdir}/bigtop-detect-javahome
-%{_libexecdir}/bigtop-detect-javalibs
+%{lib_dir}/bigtop-detect-javahome
+%{lib_dir}/bigtop-detect-javalibs
%changelog
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index 8dff524..4ed2b56 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -62,6 +62,7 @@
# Hadoop outputs built binaries into %{hadoop_build}
%define hadoop_build_path build
%define static_images_dir src/webapps/static/images
+%define libexecdir /usr/lib
%ifarch i386
%global hadoop_arch Linux-i386-32
@@ -87,7 +88,6 @@
%{nil}
%define netcat_package nc
-%define libexecdir %{_libexecdir}
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define alternatives_cmd alternatives
%global initd_dir %{_sysconfdir}/rc.d/init.d
@@ -108,7 +108,6 @@
%{nil}
%define netcat_package netcat-openbsd
-%define libexecdir /usr/lib
%define doc_hadoop %{_docdir}/%{name}
%define alternatives_cmd update-alternatives
%global initd_dir %{_sysconfdir}/rc.d
@@ -116,7 +115,6 @@
%if 0%{?mgaversion}
%define netcat_package netcat-openbsd
-%define libexecdir /usr/libexec/
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define alternatives_cmd update-alternatives
%global initd_dir %{_sysconfdir}/rc.d/init.d
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh b/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
index edba224..b33d7e4 100755
--- a/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
+++ b/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
@@ -35,11 +35,7 @@ set -e
. /etc/default/hbase
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON_SCRIPT="/usr/lib/hbase/bin/hbase-daemon.sh"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2c84ba57/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse b/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse
index bb51083..9fe8025 100644
--- a/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse
+++ b/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh.suse
@@ -37,11 +37,7 @@
. /etc/default/hbase
# Autodetect JAVA_HOME if not defined
-if [ -e /usr/libexec/bigtop-detect-javahome ]; then
- . /usr/libexec/bigtop-detect-javahome
-elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
- . /usr/lib/bigtop-utils/bigtop-detect-javahome
-fi
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
STATUS_RUNNING=0
STATUS_DEAD=1