Commita7cdfdf

committed

Fix pg_upgrade to notice if psql fails to execute the given

script, and not proceed with the update if so.Also add #!/bin/sh header line.

1 parent30b2d28 commita7cdfdfCopy full SHA for a7cdfdf

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-:`
	`1`	`+#!/bin/sh`
	`2`	`+#`
	`3`	`+# pg_upgrade: update a database without needing a full dump/reload cycle`
	`4`	`+# CAUTION: read the manual page before trying to use this!`
	`5`	`+`
`2`	`6`	`trap"rm -f /tmp/$$" 0 1 2 3 15`
`3`	`7`
`4`	`8`	`if ["$#"-eq 0 ]`
`@@ -67,6 +71,11 @@ cat $INPUT \| awk '{`
`67`	`71`
`68`	`72`	`psql"template1"<"/tmp/$$"`
`69`	`73`
	`74`	`+if [$?-ne 0 ]`
	`75`	`+thenecho"psql failed to execute$INPUT script."1>&2`
	`76`	`+exit 1`
	`77`	`+fi`
	`78`	`+`
`70`	`79`	`forDIRin data/base/*`
`71`	`80`	`do`
`72`	`81`	BASEDIR="`basename$DIR`"
`@@ -86,4 +95,4 @@ done`
`86`	`95`	`mv$OLDDIR/pg_log data`
`87`	`96`	`mv$OLDDIR/pg_variable data`
`88`	`97`
`89`		`-echo "You mayremoved the $OLDDIR directory with 'rm -r $OLDDIR'."`
	`98`	`+echo"You mayremove the$OLDDIR directory with 'rm -r$OLDDIR'."`

Comments

(0)