From f192da1ba3da18dada3bd1d9030323b64f31ccb4 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 13 Mar 2001 21:37:15 +0000
Subject: [PATCH] Provide more useful error message if 'postgres -V' failed. 
 Advertise pg_ctl '-l' option.

---
 src/bin/initdb/initdb.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index c526b0b8fe..1653987f73 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -23,7 +23,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.121 2001/02/18 18:33:59 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.122 2001/03/13 21:37:15 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -117,8 +117,19 @@ elif [ -x "$bindir/postgres" ]; then
     then
         PGPATH=$bindir
     else
-        echo "The program '$bindir/postgres' needed by $CMDNAME does not belong to" 1>&2
-        echo "PostgreSQL version $VERSION.  Check your installation." 1>&2
+        # Maybe there was an error message?
+        errormsg=`$bindir/postgres -V 2>&1 >/dev/null`
+      (
+        echo "The program "
+        echo "    '$bindir/postgres'"
+        echo "needed by $CMDNAME does not belong to PostgreSQL version $VERSION, or"
+        echo "there may be a configuration problem."
+        if test x"$errormsg" != x""; then
+            echo
+            echo "This was the error message issued by that program:"
+            echo "$errormsg"
+        fi
+      ) 1>&2
         exit 1
     fi
 else
@@ -638,9 +649,11 @@ echo "VACUUM pg_database" \
 echo
 echo "Success. You can now start the database server using:"
 echo ""
-echo "	$PGPATH/postmaster -D $PGDATA"
+echo "    $PGPATH/postmaster -D $PGDATA"
 echo "or"
-echo "	$PGPATH/pg_ctl -D $PGDATA start"
+# (Advertise -l option here, otherwise we have a background
+#  process writing to the terminal.)
+echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
 echo
 
 exit 0
-- 
2.40.0