Updated Branches: refs/heads/master 0d3f7c85a -> 9ddee9b42
http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/deb/zookeeper/zookeeper-server.init ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper-server.init b/bigtop-packages/src/deb/zookeeper/zookeeper-server.init index a749f3d..3c2e120 100644 --- a/bigtop-packages/src/deb/zookeeper/zookeeper-server.init +++ b/bigtop-packages/src/deb/zookeeper/zookeeper-server.init @@ -113,11 +113,11 @@ hadoop_stop_pidfile() { start() { - su -s /bin/sh zookeeper -c "${DAEMON_SCRIPT} start" + su -s /bin/bash zookeeper -c "${DAEMON_SCRIPT} start" } stop() { if hadoop_check_pidfile $PID_FILE ; then - su -s /bin/sh zookeeper -c "${DAEMON_SCRIPT} stop" + su -s /bin/bash zookeeper -c "${DAEMON_SCRIPT} stop" fi } @@ -171,7 +171,7 @@ case "$1" in exit 1 else shift - su -s /bin/sh zookeeper -c "zookeeper-server-initialize $*" + su -s /bin/bash zookeeper -c "zookeeper-server-initialize $*" fi ;; *) http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/deb/zookeeper/zookeeper.postinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper.postinst b/bigtop-packages/src/deb/zookeeper/zookeeper.postinst index 44bbcbd..a574ba4 100644 --- a/bigtop-packages/src/deb/zookeeper/zookeeper.postinst +++ b/bigtop-packages/src/deb/zookeeper/zookeeper.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/deb/zookeeper/zookeeper.preinst ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper.preinst b/bigtop-packages/src/deb/zookeeper/zookeeper.preinst index eee6e5f..3183a51 100644 --- a/bigtop-packages/src/deb/zookeeper/zookeeper.preinst +++ b/bigtop-packages/src/deb/zookeeper/zookeeper.preinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/deb/zookeeper/zookeeper.prerm ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zookeeper/zookeeper.prerm b/bigtop-packages/src/deb/zookeeper/zookeeper.prerm index fed04e7..023a4a5 100644 --- a/bigtop-packages/src/deb/zookeeper/zookeeper.prerm +++ b/bigtop-packages/src/deb/zookeeper/zookeeper.prerm @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec b/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec index 3592204..f6271d7 100644 --- a/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec +++ b/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec @@ -37,7 +37,7 @@ License: ASL 2.0 Source0: %{datafu_name}-%{datafu_base_version}.tar.gz Source1: do-component-build Source2: install_%{datafu_name}.sh -Requires: hadoop-client, bigtop-utils >= 0.6 +Requires: hadoop-client, bigtop-utils >= 0.7 %description http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/flume/SPECS/flume.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/flume/SPECS/flume.spec b/bigtop-packages/src/rpm/flume/SPECS/flume.spec index 6a9745a..af799ce 100644 --- a/bigtop-packages/src/rpm/flume/SPECS/flume.spec +++ b/bigtop-packages/src/rpm/flume/SPECS/flume.spec @@ -70,7 +70,7 @@ Source4: flume-agent.default Requires: /usr/sbin/useradd Requires: coreutils Requires: hadoop-hdfs -Requires: bigtop-utils >= 0.6 +Requires: bigtop-utils >= 0.7 %if 0%{?mgaversion} Requires: bsh-utils http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec index d2650b7..eeb09b6 100644 --- a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec +++ b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec @@ -59,7 +59,7 @@ Source1: do-component-build Source2: install_%{name}.sh Source3: giraph-site.xml Buildarch: noarch -Requires: zookeeper, hadoop-client, bigtop-utils >= 0.6 +Requires: zookeeper, hadoop-client, bigtop-utils >= 0.7 %description Giraph implements a graph processing platform to run large scale algorithms (such as page rank, shared connections, personalization-based popularity, etc.) on top of Hadoop infrastructure. Giraph builds upon the graph-oriented nature of Pregel but additionally adds fault-tolerance to the coordinator process with the use of ZooKeeper as its centralized coordination service. http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/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 acfc2fa..f2fdd4d 100644 --- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec +++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec @@ -164,7 +164,7 @@ Source23: hadoop-hdfs-zkfc.svc Source24: hadoop-hdfs-journalnode.svc Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n) BuildRequires: fuse-devel, fuse, cmake -Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils >= 0.6, zookeeper >= 3.4.0 +Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils >= 0.7, zookeeper >= 3.4.0 Requires: psmisc, %{netcat_package} # Sadly, Sun/Oracle JDK in RPM form doesn't provide libjvm.so, which means we have # to set AutoReq to no in order to minimize confusion. Not ideal, but seems to work. http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec index 523899a..333ec86 100644 --- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec +++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec @@ -93,7 +93,7 @@ Source6: hbase.nofiles.conf Source7: regionserver-init.d.tpl BuildArch: noarch Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service -Requires: hadoop-hdfs, zookeeper >= 3.3.1, bigtop-utils >= 0.6 +Requires: hadoop-hdfs, zookeeper >= 3.3.1, bigtop-utils >= 0.7 %if 0%{?mgaversion} Requires: bsh-utils http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec b/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec index 4fd8d23..4850f5a 100644 --- a/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec +++ b/bigtop-packages/src/rpm/hcatalog/SPECS/hcatalog.spec @@ -63,7 +63,7 @@ Source5: webhcat-server.svc Source6: hcatalog-server.default Source7: webhcat-server.default Source8: init.d.tmpl -Requires: hadoop, hive, bigtop-utils +Requires: hadoop, hive, bigtop-utils >= 0.7 %description Apache HCatalog (incubating) is a table and storage management service for data created using Apache Hadoop. http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/hive/SPECS/hive.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec index 7e7d273..d3a964b 100644 --- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec +++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec @@ -71,7 +71,7 @@ Source7: hive.1 Source8: hive-site.xml Source9: hive-server.svc Source10: hive-metastore.svc -Requires: hadoop-client, bigtop-utils >= 0.6, hbase, zookeeper, hive-jdbc +Requires: hadoop-client, bigtop-utils >= 0.7, hbase, zookeeper, hive-jdbc = %{version}-%{release} Obsoletes: %{name}-webinterface %description http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec index 4309c1a..4ee0333 100644 --- a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec +++ b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec @@ -44,7 +44,7 @@ License: ASL 2.0 Source0: %{name}-distribution-%{mahout_base_version}-src.tar.gz Source1: do-component-build Source2: install_%{name}.sh -Requires: hadoop-client, bigtop-utils >= 0.6 +Requires: hadoop-client, bigtop-utils >= 0.7 %description http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec index 4bbc212..cc4223c 100644 --- a/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec +++ b/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec @@ -115,7 +115,7 @@ URL: http://incubator.apache.org/oozie/ Group: Development/Libraries License: APL2 BuildArch: noarch -Requires: bigtop-utils >= 0.6 +Requires: bigtop-utils >= 0.7 %description client http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/pig/SPECS/pig.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/pig/SPECS/pig.spec b/bigtop-packages/src/rpm/pig/SPECS/pig.spec index 1e5b8f7..da409b9 100644 --- a/bigtop-packages/src/rpm/pig/SPECS/pig.spec +++ b/bigtop-packages/src/rpm/pig/SPECS/pig.spec @@ -82,7 +82,7 @@ Source3: log4j.properties Source4: pig.1 Source5: pig.properties Source6: bigtop.bom -Requires: hadoop-client, bigtop-utils >= 0.6 +Requires: hadoop-client, bigtop-utils >= 0.7 %description Pig is a platform for analyzing large data sets that consists of a high-level language http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/solr/SPECS/solr.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/solr/SPECS/solr.spec b/bigtop-packages/src/rpm/solr/SPECS/solr.spec index bda33c8..e8de186 100644 --- a/bigtop-packages/src/rpm/solr/SPECS/solr.spec +++ b/bigtop-packages/src/rpm/solr/SPECS/solr.spec @@ -57,7 +57,7 @@ Source4: web.xml Source5: logging.properties Source6: solr.default Source7: solr-server.init -Requires: bigtop-utils >= 0.6, bigtop-tomcat +Requires: bigtop-utils >= 0.7, bigtop-tomcat # CentOS 5 does not have any dist macro # So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec index 5f4447b..2d1b6aa 100644 --- a/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec +++ b/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec @@ -67,7 +67,7 @@ Source9: sqoop-server.svc Source10: sqoop-server.sh Buildarch: noarch BuildRequires: asciidoc -Requires: hadoop-client, bigtop-utils >= 0.6, bigtop-tomcat, %{name}-client = %{version}-%{release} +Requires: hadoop-client, bigtop-utils >= 0.7, bigtop-tomcat, %{name}-client = %{version}-%{release} %description Sqoop is a tool that provides the ability to import and export data sets between the Hadoop Distributed File System (HDFS) and relational databases. http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec index edece5e..e9df24e 100644 --- a/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec +++ b/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec @@ -37,7 +37,7 @@ Source0: %{name}-%{whirr_base_version}-src.tar.gz Source1: do-component-build Source2: install_%{name}.sh Source3: whirr.1 -Requires: bigtop-utils >= 0.6 +Requires: bigtop-utils >= 0.7 %description Whirr provides http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec index bee9d7a..320450b 100644 --- a/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec +++ b/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec @@ -79,7 +79,7 @@ BuildRequires: autoconf, automake Requires(pre): coreutils, /usr/sbin/groupadd, /usr/sbin/useradd Requires(post): %{alternatives_dep} Requires(preun): %{alternatives_dep} -Requires: bigtop-utils >= 0.6 +Requires: bigtop-utils >= 0.7 %description ZooKeeper is a centralized service for maintaining configuration information, http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ddee9b4/bigtop-packages/src/templates/init.d.tmpl ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/templates/init.d.tmpl b/bigtop-packages/src/templates/init.d.tmpl index 39e4f4c..5792324 100644 --- a/bigtop-packages/src/templates/init.d.tmpl +++ b/bigtop-packages/src/templates/init.d.tmpl @@ -185,11 +185,7 @@ BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default} [ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/$DAEMON ] && . \${BIGTOP_DEFAULTS_DIR}/$DAEMON # 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
