diff options
| author | Marek Majkowski <marek@rabbitmq.com> | 2010-07-01 15:54:28 +0100 |
|---|---|---|
| committer | Marek Majkowski <marek@rabbitmq.com> | 2010-07-01 15:54:28 +0100 |
| commit | 0651bac06c30079ee295ea467a1c8a1ac7ecb8b0 (patch) | |
| tree | dfcd3da1c05153d7fada00853f4062b657773b2b | |
| parent | 932739794200cef177a41b0970667db0273b4f4a (diff) | |
| parent | 4f89176bd75985219c96c304e7827322db86139e (diff) | |
| download | rabbitmq-server-0651bac06c30079ee295ea467a1c8a1ac7ecb8b0.tar.gz | |
Default merged into bug22914
| -rw-r--r-- | packaging/macports/Makefile | 11 | ||||
| -rw-r--r-- | packaging/macports/Portfile.in | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile index 4ad4c30b..73254532 100644 --- a/packaging/macports/Makefile +++ b/packaging/macports/Makefile @@ -35,7 +35,16 @@ macports: dirs $(DEST)/Portfile for f in rabbitmq-asroot-script-wrapper rabbitmq-script-wrapper ; do \ cp $(COMMON_DIR)/$$f $(DEST)/files ; \ done - sed -i -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh su -m rabbitmq -c|' \ + # The purpose of this intricate substitution is to set up the + # same environment vars that su will on Linux. On OS X, we + # have to use the -m option to su in order to be able to set + # the shell (which for the rabbitmq user would otherwise be + # /dev/null). But the -m option means that *all* environment + # vars get preserved. Erlang needs vars such as HOME to be + # set. So we have to set them explicitly. Note that the IFS + # value is "<space><tab><newline>" + sed -i -e 's|@SU_RABBITMQ_SH_C@|SHELL=/bin/sh HOME=/var/lib/rabbitmq IFS=" \\\ +" USER=rabbitmq LOGNAME=rabbitmq PATH="$$(eval `PATH=MACPORTS_PREFIX/bin /usr/libexec/path_helper -s`; echo $$PATH)" su -m rabbitmq -c|' \ $(DEST)/files/rabbitmq-script-wrapper cp patch-org.macports.rabbitmq-server.plist.diff $(DEST)/files if [ -n "$(MACPORTS_USERHOST)" ] ; then \ diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in index 188a81c0..be0d24d7 100644 --- a/packaging/macports/Portfile.in +++ b/packaging/macports/Portfile.in @@ -97,6 +97,8 @@ post-destroot { xinstall -m 555 ${filespath}/rabbitmq-asroot-script-wrapper \ ${wrappersbin}/rabbitmq-activate-plugins + reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \ + ${wrappersbin}/rabbitmq-multi reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \ ${wrappersbin}/rabbitmq-multi reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \ |