Removed default shell, changed wrapper to work without default shell

timc@afallen.home · timc@afallen.home · commit 11ab8c4ff602 · 2009-06-10T18:27:53.000+01:00
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile
@@ -52,7 +52,7 @@ destroot.keepdirs \
 
 pre-destroot {
     addgroup ${servergroup}
-    adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome} shell=/bin/bash
+    adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}
 }
 
 post-destroot {
diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -14,7 +14,7 @@ cd /var/lib/rabbitmq
 SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; then
-    su rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+    sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
     echo -e "\nOnly root should run ${SCRIPT}\n"

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ destroot.keepdirs \`
`52`	`52`
`53`	`53`	`pre-destroot {`
`54`	`54`	`addgroup ${servergroup}`
`55`		`- adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome} shell=/bin/bash`
	`55`	`+ adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`post-destroot {`