Skip to content

Commit 92fd384

Browse files
committed
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.
1 parent 9c5327b commit 92fd384

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/bin/pg_ctl/pg_ctl.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# 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 $
1212
#
1313
#-------------------------------------------------------------------------
1414

@@ -84,17 +84,17 @@ fi
8484

8585
# Check if needed programs actually exist in path
8686
if [ -x "$self_path/postmaster" ] && [ -x "$self_path/psql" ]; then
87-
PGPATH=$self_path
87+
PGPATH="$self_path"
8888
elif [ -x "$bindir/postmaster" ] && [ -x "$bindir/psql" ]; then
89-
PGPATH=$bindir
89+
PGPATH="$bindir"
9090
else
9191
echo "The programs 'postmaster' and 'psql' are needed by $CMDNAME but" 1>&2
9292
echo "were not found in the directory '$bindir'." 1>&2
9393
echo "Check your installation." 1>&2
9494
exit 1
9595
fi
9696

97-
po_path=$PGPATH/postmaster
97+
po_path="$PGPATH/postmaster"
9898

9999
# set default shutdown signal
100100
sig="-TERM"
@@ -287,7 +287,7 @@ if [ $op = "start" -o $op = "restart" ];then
287287
$ECHO_N "Waiting for postmaster to start up.."$ECHO_C
288288
while :
289289
do
290-
if psql -l >/dev/null 2>&1
290+
if "$PGPATH/psql" -l >/dev/null 2>&1
291291
then
292292
break;
293293
else

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy