88#
99#
1010# IDENTIFICATION
11- # $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.16 2000/11/29 20:59:53 tgl Exp $
11+ # $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.17 2000/12/30 06:10:43 ishii Exp $
1212#
1313# -------------------------------------------------------------------------
1414
@@ -215,7 +215,7 @@ if [ $op = "stop" -o $op = "restart" ];then
215215
216216kill $sig $PID
217217
218- # wait for postmastershutting down
218+ # wait for postmasterto shut down
219219if [" $wait " = 1-o $op = " restart" ; then
220220 cnt=0
221221$ECHO_N " Waiting for postmaster to shut down.." $ECHO_C
@@ -226,18 +226,19 @@ if [ $op = "stop" -o $op = "restart" ];then
226226$ECHO_N " ." $ECHO_C
227227 cnt=` expr$cnt + 1`
228228if [$cnt -gt 60 ]; then
229- echo " $CMDNAME : postmaster does not shut down"
229+ echo " failed."
230+ echo " postmaster does not shut down."
230231exit 1
231232fi
232233else
233234break
234235fi
235236sleep 1
236237done
237- echo " done"
238+ echo " done. "
238239fi
239240
240- echo " postmaster successfully shut down"
241+ echo " postmaster successfully shut down. "
241242
242243else
243244echo " $CMDNAME : cannot find$PIDFILE "
@@ -281,7 +282,7 @@ if [ $op = "start" -o $op = "restart" ];then
281282fi
282283fi
283284
284- # wait for postmasterstarting up
285+ # wait for postmasterto start up
285286if [" $wait " = 1 ]; then
286287cnt=0
287288$ECHO_N " Waiting for postmaster to start up.." $ECHO_C