From 92fd3847799df28e978f83e82ceaf530c77efbd5 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 27 Nov 2000 02:50:17 +0000
Subject: [PATCH] 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.

---
 src/bin/pg_ctl/pg_ctl.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index aea4a98690..ae7a1c19a0 100755
--- a/src/bin/pg_ctl/pg_ctl.sh
+++ b/src/bin/pg_ctl/pg_ctl.sh
@@ -8,7 +8,7 @@
 #
 #
 # 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
 
 # Check if needed programs actually exist in path
 if [ -x "$self_path/postmaster" ] && [ -x "$self_path/psql" ]; then
-    PGPATH=$self_path
+    PGPATH="$self_path"
 elif [ -x "$bindir/postmaster" ] && [ -x "$bindir/psql" ]; then
-    PGPATH=$bindir
+    PGPATH="$bindir"
 else
     echo "The programs 'postmaster' and 'psql' are needed by $CMDNAME but" 1>&2
     echo "were not found in the directory '$bindir'." 1>&2
@@ -94,7 +94,7 @@ else
     exit 1
 fi
 
-po_path=$PGPATH/postmaster
+po_path="$PGPATH/postmaster"
 
 # set default shutdown signal
 sig="-TERM"
@@ -287,7 +287,7 @@ if [ $op = "start" -o $op = "restart" ];then
 	$ECHO_N "Waiting for postmaster to start up.."$ECHO_C
 	while :
 	do
-	    if psql -l >/dev/null 2>&1
+	    if "$PGPATH/psql" -l >/dev/null 2>&1
 	    then
 		break;
 	    else