mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix overly-aggressive and inconsistent quoting in OS X start script.

Browse Source 
Sidar Lopez, per bug #6310, with some additional improvements by me.
Back-patch to 9.0, where the issue was introduced.
This commit is contained in:
Tom Lane 2011-11-26 13:01:02 -05:00
parent 4cdb41b54e
commit 6c8768c386
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/start-scripts/osx/PostgreSQL
View File

@ -85,28 +85,28 @@ StartService () {
if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
ConsoleMessage "Starting PostgreSQL database server" ConsoleMessage "Starting PostgreSQL database server"
if [ "${ROTATELOGS}" = "1" ]; then if [ "${ROTATELOGS}" = "1" ]; then
sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} & sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} &
else else
sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1 sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1
fi fi
fi fi
} }
StopService () { StopService () {
ConsoleMessage "Stopping PostgreSQL database server" ConsoleMessage "Stopping PostgreSQL database server"
sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast"
} }
RestartService () { RestartService () {
if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
ConsoleMessage "Restarting PostgreSQL database server" ConsoleMessage "Restarting PostgreSQL database server"
# should match StopService: # should match StopService:
sudo -u $PGUSER $PGCTL stop -D "$PGDATA" -s -m fast sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast"
# should match StartService: # should match StartService:
if [ "${ROTATELOGS}" = "1" ]; then if [ "${ROTATELOGS}" = "1" ]; then
sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} '${PGLOG}' ${ROTATESEC} & sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} &
else else
sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1 sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1
fi fi
else else
StopService StopService