postgresql-pg_ctl-nopsql.patch

   1 --- postgresql-7.4.2/src/bin/pg_ctl/pg_ctl.sh.orig      Fri Mar 26 15:54:46 2004
   2 +++ postgresql-7.4.2/src/bin/pg_ctl/pg_ctl.sh   Fri Mar 26 16:04:50 2004
   3 @@ -98,12 +98,12 @@
   4  fi
   5
   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
   9      PGPATH="$self_path"
  10 -elif [ -x "$bindir/postmaster" ] && [ -x "$bindir/psql" ]; then
  11 +elif [ -x "$bindir/postmaster" ]; then
  12      PGPATH="$bindir"
  13  else
  14 -    echo "The programs \"postmaster\" and \"psql\" are needed by $CMDNAME but" 1>&2
  15 +    echo "The programs \"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
  18      exit 1
  19 @@ -384,7 +384,8 @@
  20         $silence_echo $ECHO_N "waiting for postmaster to start..."$ECHO_C
  21         while :
  22         do
  23 -           if "$PGPATH/psql" -p $PGPORT -l >/dev/null 2>&1
  24 +           # YES, this is horribly misconceived.
  25 +           if ps ax | grep -q "[p]ostmaster -D $PGDATA" >/dev/null 2>&1
  26             then
  27                 break;
  28             else