|
8 | 8 | # |
9 | 9 | # |
10 | 10 | # IDENTIFICATION |
11 | | -# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.14 2000/11/25 17:17:30 petere Exp $ |
| 11 | +# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.15 2000/11/27 02:50:17 tgl Exp $ |
12 | 12 | # |
13 | 13 | #------------------------------------------------------------------------- |
14 | 14 |
|
|
84 | 84 |
|
85 | 85 | # Check if needed programs actually exist in path |
86 | 86 | if [-x"$self_path/postmaster" ]&& [-x"$self_path/psql" ];then |
87 | | - PGPATH=$self_path |
| 87 | + PGPATH="$self_path" |
88 | 88 | elif [-x"$bindir/postmaster" ]&& [-x"$bindir/psql" ];then |
89 | | - PGPATH=$bindir |
| 89 | + PGPATH="$bindir" |
90 | 90 | else |
91 | 91 | echo"The programs 'postmaster' and 'psql' are needed by$CMDNAME but"1>&2 |
92 | 92 | echo"were not found in the directory '$bindir'."1>&2 |
93 | 93 | echo"Check your installation."1>&2 |
94 | 94 | exit 1 |
95 | 95 | fi |
96 | 96 |
|
97 | | -po_path=$PGPATH/postmaster |
| 97 | +po_path="$PGPATH/postmaster" |
98 | 98 |
|
99 | 99 | # set default shutdown signal |
100 | 100 | sig="-TERM" |
@@ -287,7 +287,7 @@ if [ $op = "start" -o $op = "restart" ];then |
287 | 287 | $ECHO_N"Waiting for postmaster to start up.."$ECHO_C |
288 | 288 | while: |
289 | 289 | do |
290 | | -if psql -l>/dev/null2>&1 |
| 290 | +if"$PGPATH/psql" -l>/dev/null2>&1 |
291 | 291 | then |
292 | 292 | break; |
293 | 293 | else |
|