Merge pull request #514 from doraskayo/after-script-exit-on-error

fosslinux · web-flow · commit 1899f7f02b28 · 2025-02-26T23:00:38.000+11:00
Abort execution on non-0 exit status from "after" scripts
diff --git a/steps/improve/after.sh b/steps/improve/after.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+# SPDX-FileCopyrightText: 2025 Dor Askayo <dor.askayo@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
@@ -10,7 +11,10 @@
 . /steps/env
 
 if [ -d /steps/after ]; then
-    find /steps/after -maxdepth 1 -name '*.sh' -exec bash {} \;
+    after_scripts=$(find /steps/after -maxdepth 1 -type f -name '*.sh' -printf '%f\t%p\n' | sort -k1 -n | cut -f2)
+    for script in $after_scripts; do
+        bash "$script"
+    done
 fi
 
 if [ "${INTERACTIVE}" = True ]; then

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`	`3`	`# SPDX-FileCopyrightText: 2024 Gábor Stefanik <[email protected]>`
	`4`	`+# SPDX-FileCopyrightText: 2025 Dor Askayo <[email protected]>`
`4`	`5`	`#`
`5`	`6`	`# SPDX-License-Identifier: GPL-3.0-or-later`
`6`	`7`	`#`
`@@ -10,7 +11,10 @@`
`10`	`11`	`. /steps/env`
`11`	`12`
`12`	`13`	`if [ -d /steps/after ]; then`
`13`		`- find /steps/after -maxdepth 1 -name '*.sh' -exec bash {} \;`
	`14`	`+ after_scripts=$(find /steps/after -maxdepth 1 -type f -name '*.sh' -printf '%f\t%p\n' \| sort -k1 -n \| cut -f2)`
	`15`	`+ for script in $after_scripts; do`
	`16`	`+ bash "$script"`
	`17`	`+ done`
`14`	`18`	`fi`
`15`	`19`
`16`	`20`	`if [ "${INTERACTIVE}" = True ]; then`