diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-11-26 13:01:02 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-11-26 13:01:22 -0500 |
| commit | 19d88c9f82b9a2b0e8497ec16b636dc7fdb46dfb (patch) | |
| tree | bb93952f629afcbfdcec880554500de33ec86f37 | |
| parent | e75d41f0c3e69fefe24a98514b897716d60a83dd (diff) | |
| download | postgresql-19d88c9f82b9a2b0e8497ec16b636dc7fdb46dfb.tar.gz postgresql-19d88c9f82b9a2b0e8497ec16b636dc7fdb46dfb.zip | |
Fix overly-aggressive and inconsistent quoting in OS X start script.
Sidar Lopez, per bug #6310, with some additional improvements by me.
Back-patch to 9.0, where the issue was introduced.
| -rwxr-xr-x | contrib/start-scripts/osx/PostgreSQL | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL index 58e69bc784f..e4b56dfb3b4 100755 --- a/contrib/start-scripts/osx/PostgreSQL +++ b/contrib/start-scripts/osx/PostgreSQL @@ -85,28 +85,28 @@ StartService () { if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then ConsoleMessage "Starting PostgreSQL database server" 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 - sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1 + sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1 fi fi } StopService () { 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 () { if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then ConsoleMessage "Restarting PostgreSQL database server" # 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: 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 - sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>$PGLOG 2>&1 + sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1 fi else StopService |