Patches to make POSTPORT changes in scripts

scrappy · scrappy · commit df79870a825e · 1996-09-21T06:18:52.000Z
Originally submitted by: ernst.molitor@uni-bonn.de
resubmitted by: D'Arcy Cain
diff --git a/src/Makefile.global b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.5 1996/08/20 04:06:12 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.6 1996/09/21 06:16:09 scrappy Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -105,6 +105,9 @@ POSTDOCDIR=	$(POSTGRESDIR)/doc
 # Where the header files necessary to build frontend programs get installed.
 HEADERDIR=	$(POSTGRESDIR)/include
 
+# The port to run the postmaster on
+POSTPORT= 6543
+
 # NAMEDATALEN is the max length for system identifiers (e.g. table names, 
 # attribute names, function names, etc.)  
 #
diff --git a/src/bin/createdb/createdb.sh b/src/bin/createdb/createdb.sh
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.3 1996/07/27 02:19:00 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.3.2.1 1996/09/21 06:16:32 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@
 #	PGDATA, PGHOST, and PGPORT
 #
 # ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
 [ -z "$PGHOST" ] && PGHOST=localhost
 BINDIR=_fUnKy_BINDIR_sTuFf_
 PATH=$BINDIR:$PATH
diff --git a/src/bin/createuser/createuser.sh b/src/bin/createuser/createuser.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.3 1996/07/27 02:19:06 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.3.2.1 1996/09/21 06:16:39 scrappy Exp $
 #
 # Note - this should NOT be setuid.
 #
@@ -22,7 +22,7 @@
 #       PGDATA, PGHOST, and PGPORT
 #
 # ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
 [ -z "$PGHOST" ] && PGHOST=localhost
 BINDIR=_fUnKy_BINDIR_sTuFf_
 PATH=$BINDIR:$PATH
diff --git a/src/bin/destroydb/destroydb.sh b/src/bin/destroydb/destroydb.sh
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/destroydb.sh,v 1.3 1996/07/27 02:19:12 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/destroydb.sh,v 1.3.2.1 1996/09/21 06:18:33 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@
 #       PGDATA, PGHOST, and PGPORT
 #
 # ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
 [ -z "$PGHOST" ] && PGHOST=localhost
 BINDIR=_fUnKy_BINDIR_sTuFf_
 PATH=$BINDIR:$PATH
diff --git a/src/bin/destroyuser/destroyuser.sh b/src/bin/destroyuser/destroyuser.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.3 1996/07/27 02:19:18 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.3.2.1 1996/09/21 06:18:40 scrappy Exp $
 #
 # Note - this should NOT be setuid.
 #
@@ -22,7 +22,7 @@
 #       PGDATA, PGHOST, and PGPORT
 #
 # ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
 [ -z "$PGHOST" ] && PGHOST=localhost
 BINDIR=_fUnKy_BINDIR_sTuFf_
 PATH=$BINDIR:$PATH
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
@@ -12,7 +12,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.4 1996/07/23 03:03:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.4.2.1 1996/09/21 06:18:52 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,7 +25,7 @@
 #
 # ----------------
 [ -z "$PGDATA" ] && { PGDATA=_fUnKy_DATADIR_sTuFf_; export PGDATA; }
-[ -z "$PGPORT" ] && { PGPORT=5432; export PGPORT; }
+[ -z "$PGPORT" ] && { PGPORT=_fUnKy_POSTPORT_sTuFf_; export PGPORT; }
 [ -z "$PGHOST" ] && { PGHOST=localhost; export PGHOST; }
 POSTGRESDIR=_fUnKy_POSTGRESDIR_sTuFf_
 BINDIR=_fUnKy_BINDIR_sTuFf_

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/Attic/Makefile.global,v 1.19.2.5 1996/08/20 04:06:12 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.19.2.6 1996/09/21 06:16:09 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`# NOTES`
`13`	`13`	`# This is seen by any Makefiles that include mk/postgres.mk. To`
`@@ -105,6 +105,9 @@ POSTDOCDIR= $(POSTGRESDIR)/doc`
`105`	`105`	`# Where the header files necessary to build frontend programs get installed.`
`106`	`106`	`HEADERDIR= $(POSTGRESDIR)/include`
`107`	`107`
	`108`	`+# The port to run the postmaster on`
	`109`	`+POSTPORT= 6543`
	`110`	`+`
`108`	`111`	`# NAMEDATALEN is the max length for system identifiers (e.g. table names,`
`109`	`112`	`# attribute names, function names, etc.)`
`110`	`113`	`#`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#`
`12`	`12`	`#`
`13`	`13`	`# IDENTIFICATION`
`14`		`-# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.3 1996/07/27 02:19:00 scrappy Exp $`
	`14`	`+# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.3.2.1 1996/09/21 06:16:32 scrappy Exp $`
`15`	`15`	`#`
`16`	`16`	`#-------------------------------------------------------------------------`
`17`	`17`
`@@ -23,7 +23,7 @@`
`23`	`23`	`# PGDATA, PGHOST, and PGPORT`
`24`	`24`	`#`
`25`	`25`	`# ----------------`
`26`		`-[ -z "$PGPORT" ] && PGPORT=5432`
	`26`	`+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_`
`27`	`27`	`[ -z "$PGHOST" ] && PGHOST=localhost`
`28`	`28`	`BINDIR=_fUnKy_BINDIR_sTuFf_`
`29`	`29`	`PATH=$BINDIR:$PATH`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.3 1996/07/27 02:19:06 scrappy Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.3.2.1 1996/09/21 06:16:39 scrappy Exp $`
`12`	`12`	`#`
`13`	`13`	`# Note - this should NOT be setuid.`
`14`	`14`	`#`
`@@ -22,7 +22,7 @@`
`22`	`22`	`# PGDATA, PGHOST, and PGPORT`
`23`	`23`	`#`
`24`	`24`	`# ----------------`
`25`		`-[ -z "$PGPORT" ] && PGPORT=5432`
	`25`	`+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_`
`26`	`26`	`[ -z "$PGHOST" ] && PGHOST=localhost`
`27`	`27`	`BINDIR=_fUnKy_BINDIR_sTuFf_`
`28`	`28`	`PATH=$BINDIR:$PATH`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#`
`13`	`13`	`#`
`14`	`14`	`# IDENTIFICATION`
`15`		`-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.4 1996/07/23 03:03:19 scrappy Exp $`
	`15`	`+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.4.2.1 1996/09/21 06:18:52 scrappy Exp $`
`16`	`16`	`#`
`17`	`17`	`#-------------------------------------------------------------------------`
`18`	`18`
`@@ -25,7 +25,7 @@`
`25`	`25`	`#`
`26`	`26`	`# ----------------`
`27`	`27`	`[ -z "$PGDATA" ] && { PGDATA=_fUnKy_DATADIR_sTuFf_; export PGDATA; }`
`28`		`-[ -z "$PGPORT" ] && { PGPORT=5432; export PGPORT; }`
	`28`	`+[ -z "$PGPORT" ] && { PGPORT=_fUnKy_POSTPORT_sTuFf_; export PGPORT; }`
`29`	`29`	`[ -z "$PGHOST" ] && { PGHOST=localhost; export PGHOST; }`
`30`	`30`	`POSTGRESDIR=_fUnKy_POSTGRESDIR_sTuFf_`
`31`	`31`	`BINDIR=_fUnKy_BINDIR_sTuFf_`