Commit 92fd3847 authored by Tom Lane's avatar Tom Lane

After going to the trouble of finding where psql lives, seems like

pg_ctl should invoke it from there, not use whatever random psql might
(or might not) live in its $PATH.
parent 9c5327b9
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.14 2000/11/25 17:17:30 petere Exp $ # $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.15 2000/11/27 02:50:17 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -84,9 +84,9 @@ fi ...@@ -84,9 +84,9 @@ fi
# Check if needed programs actually exist in path # Check if needed programs actually exist in path
if [ -x "$self_path/postmaster" ] && [ -x "$self_path/psql" ]; then if [ -x "$self_path/postmaster" ] && [ -x "$self_path/psql" ]; then
PGPATH=$self_path PGPATH="$self_path"
elif [ -x "$bindir/postmaster" ] && [ -x "$bindir/psql" ]; then elif [ -x "$bindir/postmaster" ] && [ -x "$bindir/psql" ]; then
PGPATH=$bindir PGPATH="$bindir"
else else
echo "The programs 'postmaster' and 'psql' are needed by $CMDNAME but" 1>&2 echo "The programs 'postmaster' and 'psql' are needed by $CMDNAME but" 1>&2
echo "were not found in the directory '$bindir'." 1>&2 echo "were not found in the directory '$bindir'." 1>&2
...@@ -94,7 +94,7 @@ else ...@@ -94,7 +94,7 @@ else
exit 1 exit 1
fi fi
po_path=$PGPATH/postmaster po_path="$PGPATH/postmaster"
# set default shutdown signal # set default shutdown signal
sig="-TERM" sig="-TERM"
...@@ -287,7 +287,7 @@ if [ $op = "start" -o $op = "restart" ];then ...@@ -287,7 +287,7 @@ if [ $op = "start" -o $op = "restart" ];then
$ECHO_N "Waiting for postmaster to start up.."$ECHO_C $ECHO_N "Waiting for postmaster to start up.."$ECHO_C
while : while :
do do
if psql -l >/dev/null 2>&1 if "$PGPATH/psql" -l >/dev/null 2>&1
then then
break; break;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment