diff options
author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 01:49:22 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 01:49:22 +0000 |
commit | 7b47a45b81d3f80ed28fe59a380f6bbae009091f (patch) | |
tree | d13d51dd54c8bca1585f6da852a0ffaa5276c3b1 | |
parent | 379e9b437720d352ae3171aaa8e2b338bdcd4e46 (diff) | |
download | rabbitmq-server-7b47a45b81d3f80ed28fe59a380f6bbae009091f.tar.gz |
Use common wrapper for scripts in rpm packages.
Fixed indentation. init.d script uses wrapper.
-rw-r--r-- | packaging/RPMS/Fedora/Makefile | 3 | ||||
-rw-r--r-- | packaging/RPMS/Fedora/init.d | 14 | ||||
-rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 10 | ||||
-rw-r--r-- | packaging/RPMS/Fedora/rabbitmqctl_wrapper | 19 | ||||
-rw-r--r-- | packaging/common/rabbitmq-script-wrapper | 6 |
5 files changed, 18 insertions, 34 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index cf3a93df..973608cc 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -1,5 +1,6 @@ VERSION=0.0.0 SOURCE_TARBALL_DIR=../../../dist +COMMON_DIR=../../common TARBALL=$(SOURCE_TARBALL_DIR)/rabbitmq-server-$(VERSION).tar.gz TOP_DIR=$(shell pwd) #Under debian we do not want to check build dependencies, since that @@ -30,7 +31,7 @@ prepare: SPECS/rabbitmq-server.spec cp init.d SOURCES/rabbitmq-server.init - cp rabbitmqctl_wrapper SOURCES/rabbitmq-server.wrapper + cp ${COMMON_DIR}/* SOURCES/ cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d index a006a5a7..21932de0 100644 --- a/packaging/RPMS/Fedora/init.d +++ b/packaging/RPMS/Fedora/init.d @@ -16,8 +16,8 @@ # Short-Description: Enable AMQP service provided by RabbitMQ broker ### END INIT INFO -DAEMON_NAME=rabbitmq-multi -DAEMON=/usr/lib/rabbitmq/bin/$DAEMON_NAME +PATH=/usr/sbin:/usr/bin:/sbin:/bin +DAEMON=/usr/sbin/rabbitmq-multi NAME=rabbitmq-server DESC=rabbitmq-server USER=rabbitmq @@ -39,7 +39,7 @@ cd / start_rabbitmq () { set +e - su $USER -s /bin/sh -c "$DAEMON start_all ${NODE_COUNT}" > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err + $DAEMON start_all ${NODE_COUNT} > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err case "$?" in 0) echo SUCCESS && touch $LOCK_FILE @@ -61,7 +61,7 @@ stop_rabbitmq () { set +e status_rabbitmq quiet if [ $RETVAL = 0 ] ; then - su $USER -s /bin/sh -c "$DAEMON stop_all" > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err + $DAEMON stop_all > /var/log/rabbitmq/shutdown_log 2> /var/log/rabbitmq/shutdown_err RETVAL=$? if [ $RETVAL != 0 ] ; then echo FAILED - check /var/log/rabbitmq/shutdown_log, _err @@ -78,9 +78,9 @@ stop_rabbitmq () { status_rabbitmq() { set +e if [ "$1" != "quiet" ] ; then - su $USER -s /bin/sh -c "$DAEMON status" 2>&1 + $DAEMON status 2>&1 else - su $USER -s /bin/sh -c "$DAEMON status" > /dev/null 2>&1 + $DAEMON status > /dev/null 2>&1 fi if [ $? != 0 ] ; then RETVAL=1 @@ -90,7 +90,7 @@ status_rabbitmq() { rotate_logs_rabbitmq() { set +e - su $USER -s /bin/sh -c "$DAEMON rotate_logs ${ROTATE_SUFFIX}" 2>&1 + $DAEMON rotate_logs ${ROTATE_SUFFIX} 2>&1 set -e } diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index fc109bdb..bedf8d81 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -5,7 +5,7 @@ License: MPLv1.1 Group: Development/Libraries Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz Source1: rabbitmq-server.init -Source2: rabbitmq-server.wrapper +Source2: rabbitmq-script-wrapper Source3: rabbitmq-server.logrotate URL: http://www.rabbitmq.com/ Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. @@ -39,6 +39,7 @@ fi %prep %setup -n %{name}-%{version} +sed -i 's|/usr/lib/|%{_libdir}/|' %SOURCE2 %build make @@ -59,9 +60,10 @@ install -m 0755 %SOURCE1 %{buildroot}%{_initrddir}/rabbitmq-server chmod 0755 %{buildroot}%{_initrddir}/rabbitmq-server sed -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}%{_initrddir}/rabbitmq-server -mkdir -p %{buildroot}%{_sbindir} -install -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmqctl -sed -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}%{_sbindir}/rabbitmqctl + +install -p -D -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmqctl +install -p -D -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmq-server +install -p -D -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmq-multi mkdir -p %{buildroot}/etc/logrotate.d install -m 0644 %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server diff --git a/packaging/RPMS/Fedora/rabbitmqctl_wrapper b/packaging/RPMS/Fedora/rabbitmqctl_wrapper deleted file mode 100644 index 6b387d29..00000000 --- a/packaging/RPMS/Fedora/rabbitmqctl_wrapper +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Escape spaces and quotes, because shell is revolting. -for arg in "$@" ; do - # Escape quotes in parameters, so that they're passed through cleanly. - arg=$(sed -e 's/"/\\"/' <<-END - $arg - END - ) - CMDLINE="${CMDLINE} \"${arg}\"" -done - -cd / -if [ `id -u` = 0 ] ; then - su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/rabbitmqctl ${CMDLINE}" -else - /usr/lib/rabbitmq/bin/rabbitmqctl - echo -e "\nOnly root should run rabbitmqctl\n" - exit 1 -fi diff --git a/packaging/common/rabbitmq-script-wrapper b/packaging/common/rabbitmq-script-wrapper index 78ad528c..217d1658 100644 --- a/packaging/common/rabbitmq-script-wrapper +++ b/packaging/common/rabbitmq-script-wrapper @@ -16,8 +16,8 @@ SCRIPT=`basename $0` if [ `id -u` = 0 ] ; then su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}" else - /usr/lib/rabbitmq/bin/${SCRIPT} - echo -e "\nOnly root should run ${SCRIPT}\n" - exit 1 + /usr/lib/rabbitmq/bin/${SCRIPT} + echo -e "\nOnly root should run ${SCRIPT}\n" + exit 1 fi |