move pipefail outside of migration block

jonathankingfc · jonathankingfc · commit 9f07503f21be · 2023-07-17T13:43:24.000-04:00
diff --git a/10/root/usr/share/container-scripts/postgresql/common.sh b/10/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
     test "$postinitdb_actions" = ",migration" || return 0
 
+    set -o pipefail
     # Migration path.
     (
-        set -o pipefail
         if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
             echo '\set ON_ERROR_STOP on'
         fi
diff --git a/12/root/usr/share/container-scripts/postgresql/common.sh b/12/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
     test "$postinitdb_actions" = ",migration" || return 0
 
+    set -o pipefail
     # Migration path.
     (
-        set -o pipefail
         if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
             echo '\set ON_ERROR_STOP on'
         fi
diff --git a/13/root/usr/share/container-scripts/postgresql/common.sh b/13/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
     test "$postinitdb_actions" = ",migration" || return 0
 
+    set -o pipefail
     # Migration path.
     (
-        set -o pipefail
         if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
             echo '\set ON_ERROR_STOP on'
         fi
diff --git a/14/root/usr/share/container-scripts/postgresql/common.sh b/14/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
     test "$postinitdb_actions" = ",migration" || return 0
 
+    set -o pipefail
     # Migration path.
     (
-        set -o pipefail
         if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
             echo '\set ON_ERROR_STOP on'
         fi
diff --git a/15/root/usr/share/container-scripts/postgresql/common.sh b/15/root/usr/share/container-scripts/postgresql/common.sh
@@ -248,9 +248,9 @@ migrate_db ()
 {
     test "$postinitdb_actions" = ",migration" || return 0
 
+    set -o pipefail
     # Migration path.
     (
-        set -o pipefail
         if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
             echo '\set ON_ERROR_STOP on'
         fi
diff --git a/src/root/usr/share/container-scripts/postgresql/common.sh b/src/root/usr/share/container-scripts/postgresql/common.sh
@@ -249,9 +249,9 @@ migrate_db ()
 {
     test "$postinitdb_actions" = ",migration" || return 0
 
+    set -o pipefail
     # Migration path.
     (
-        set -o pipefail
         if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then
             echo '\set ON_ERROR_STOP on'
         fi

Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,9 @@ migrate_db ()`
`248`	`248`	`{`
`249`	`249`	`test "$postinitdb_actions" = ",migration" \|\| return 0`
`250`	`250`
	`251`	`+ set -o pipefail`
`251`	`252`	`# Migration path.`
`252`	`253`	`(`
`253`		`- set -o pipefail`
`254`	`254`	`if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then`
`255`	`255`	`echo '\set ON_ERROR_STOP on'`
`256`	`256`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -249,9 +249,9 @@ migrate_db ()`
`249`	`249`	`{`
`250`	`250`	`test "$postinitdb_actions" = ",migration" \|\| return 0`
`251`	`251`
	`252`	`+ set -o pipefail`
`252`	`253`	`# Migration path.`
`253`	`254`	`(`
`254`		`- set -o pipefail`
`255`	`255`	`if [ ${POSTGRESQL_MIGRATION_IGNORE_ERRORS-no} = no ]; then`
`256`	`256`	`echo '\set ON_ERROR_STOP on'`
`257`	`257`	`fi`