1 --- src/bin/pg_ctl/pg_ctl.sh Sat Sep 29 05:09:32 2001
2 +++ src/bin/pg_ctl/pg_ctl.sh.mis Mon Mar 24 23:16:48 2002
6 # Check if needed programs actually exist in path
7 -if [ -x "$self_path/postmaster" ] && [ -x "$self_path/psql" ]; then
8 +if [ -x "$self_path/postmaster" ]; then
10 -elif [ -x "$bindir/postmaster" ] && [ -x "$bindir/psql" ]; then
11 +elif [ -x "$bindir/postmaster" ]; then
14 - echo "The programs 'postmaster' and 'psql' are needed by $CMDNAME but" 1>&2
15 + echo "The program 'postmaster' is needed by $CMDNAME but" 1>&2
16 echo "were not found in the directory '$bindir'." 1>&2
17 echo "Check your installation." 1>&2
20 # 6) If the dynamic loader is not set up correctly (for this user/at
21 # this time), psql will fail (to find libpq).
22 # 7) If psql is misconfigured, this may fail.
23 - if "$PGPATH/psql" -l >/dev/null 2>&1
26 +# YES, this is horribly misconceived.
28 + if ps -C postmaster >/dev/null 2>&1; then
31 $silence_echo $ECHO_N "."$ECHO_C