Skip to content

Commit bcec81d

Browse files
committed
Templatize rabbitmq-script-wrapper so that it works under OSX
1 parent 617a495 commit bcec81d

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

packaging/RPMS/Fedora/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ prepare:
3434
-e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' \
3535
-e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \
3636
SOURCES/rabbitmq-server.init
37+
sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
38+
SOURCES/rabbitmq-script-wrapper
3739
cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate
3840

3941
server: prepare

packaging/common/rabbitmq-script-wrapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ cd /var/lib/rabbitmq
4545
SCRIPT=`basename $0`
4646

4747
if [ `id -u` = 0 ] ; then
48-
su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
48+
@SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
4949
elif [ `id -u` = `id -u rabbitmq` ] ; then
5050
/usr/lib/rabbitmq/bin/${SCRIPT} "$@"
5151
else

packaging/debs/Debian/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ package: clean
2626
-e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/default/rabbitmq|' \
2727
-e 's|^LOCK_FILE=.*$$|LOCK_FILE=|' \
2828
$(UNPACKED_DIR)/debian/rabbitmq-server.init
29+
sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
30+
$(UNPACKED_DIR)/debian/rabbitmq-script-wrapper
2931
chmod a+x $(UNPACKED_DIR)/debian/rules
3032
UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR)
3133
cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING)

packaging/macports/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ macports: dirs $(DEST)/Portfile
2323
for f in rabbitmq-asroot-script-wrapper rabbitmq-script-wrapper ; do \
2424
cp $(COMMON_DIR)/$$f $(DEST)/files ; \
2525
done
26+
sed -i -e 's|@SU_RABBITMQ_SH_C@|sudo -u rabbitmq -H /bin/sh -c|' \
27+
$(DEST)/files/rabbitmq-script-wrapper
2628
cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files
2729

2830
clean:

0 commit comments

Comments
 (0)