Add installation of pg_ctl

tatsuo-ishii · tatsuo-ishii · commit b680d5bec7ee · 1999-12-22T04:12:55.000Z
Locate path of postmaster in a portable way (stolen from initdb)
Add postmaster.opts.default.sample which should be copied into
$PGLIB in the installtion process. Also, it will be installed into
$PGDATA while initdb is running.
diff --git a/src/bin/Makefile b/src/bin/Makefile
@@ -7,15 +7,16 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.21 1999/12/08 10:29:36 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.22 1999/12/22 04:12:54 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ..
 include ../Makefile.global
 
 DIRS = pg_id pg_version psql pg_dump pg_passwd \
- 	scripts initdb initlocation ipcclean
+ 	scripts initdb initlocation ipcclean \
+	pg_ctl
 
 ifdef MULTIBYTE
 DIRS += pg_encoding
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.2 1999/12/08 10:29:51 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.3 1999/12/22 04:12:55 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,10 +17,11 @@ include ../../Makefile.global
 all: pg_ctl
 
 pg_ctl: pg_ctl.sh
-	sed -e 's@__BINDIR__@$(BINDIR)@' pg_ctl.sh > pg_ctl
+	cat pg_ctl.sh > pg_ctl
 
 install: pg_ctl
 	$(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
+	$(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(LIBDIR)
 
 clean:
 	rm -f pg_ctl
diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
@@ -8,13 +8,46 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.3 1999/12/06 08:49:00 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.4 1999/12/22 04:12:55 ishii Exp $
 #
 #-------------------------------------------------------------------------
 CMDNAME=`basename $0`
 
-# set default path to postmaster
-po_path=__BINDIR__/postmaster
+#
+# Find out where we're located
+#
+if echo "$0" | grep '/' > /dev/null 2>&1 
+then
+        # explicit dir name given
+        PGPATH=`echo $0 | sed 's,/[^/]*$,,'`       # (dirname command is not portable)
+else
+        # look for it in PATH ('which' command is not portable)
+        for dir in `echo "$PATH" | sed 's/:/ /g'`
+	do
+                # empty entry in path means current dir
+                [ -z "$dir" ] && dir='.'
+                if [ -f "$dir/$CMDNAME" ]
+		then
+                        PGPATH="$dir"
+                        break
+                fi
+        done
+fi
+
+# Check if needed programs actually exist in path
+for prog in postmaster
+do
+        if [ ! -x "$PGPATH/$prog" ]
+	then
+                echo "The program $prog needed by $CMDNAME could not be found. It was"
+                echo "expected at:"
+                echo "    $PGPATH/$prog"
+                echo "If this is not the correct directory, please start $CMDNAME"
+                echo "with a full search path. Otherwise make sure that the program"
+                echo "was installed successfully."
+                exit 1
+        fi
+done
 
 # set default shutdown signal
 sig="-TERM"
diff --git a/src/bin/pg_ctl/postmaster.opts.default.sample b/src/bin/pg_ctl/postmaster.opts.default.sample
@@ -0,0 +1,2 @@
+postmaster
+-S

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,16 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.21 1999/12/08 10:29:36 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.22 1999/12/22 04:12:54 ishii Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`SRCDIR= ..`
`15`	`15`	`include ../Makefile.global`
`16`	`16`
`17`	`17`	`DIRS = pg_id pg_version psql pg_dump pg_passwd \`
`18`		`- scripts initdb initlocation ipcclean`
	`18`	`+ scripts initdb initlocation ipcclean \`
	`19`	`+ pg_ctl`
`19`	`20`
`20`	`21`	`ifdef MULTIBYTE`
`21`	`22`	`DIRS += pg_encoding`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.2 1999/12/08 10:29:51 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.3 1999/12/22 04:12:55 ishii Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -17,10 +17,11 @@ include ../../Makefile.global`
`17`	`17`	`all: pg_ctl`
`18`	`18`
`19`	`19`	`pg_ctl: pg_ctl.sh`
`20`		`- sed -e 's@__BINDIR__@$(BINDIR)@' pg_ctl.sh > pg_ctl`
	`20`	`+ cat pg_ctl.sh > pg_ctl`
`21`	`21`
`22`	`22`	`install: pg_ctl`
`23`	`23`	`$(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)`
	`24`	`+ $(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(LIBDIR)`
`24`	`25`
`25`	`26`	`clean:`
`26`	`27`	`rm -f pg_ctl`