fix: keep previous returncode when using @then

poWer4aiX · poWer4aiX · commit 73434764f43c · 2025-03-27T06:39:50.000Z
diff --git a/bash_unit b/bash_unit
@@ -542,6 +542,7 @@ gherkin_WHEN() {
 }
 
 gherkin_THEN() {
+  local rc=$?
   local COL=""
   local NCOL=""
   if is_terminal; then
@@ -556,6 +557,7 @@ gherkin_THEN() {
   gherkin_last_msg="${gherkin_last_msg}    ${COL}WHEN${NCOL} $gherkin_last_when\n"
   gherkin_last_msg="${gherkin_last_msg}    ${COL}THEN${NCOL} $gherkin_last_then"
   echo ""
+  return $rc
 }
 
 gherkin_AND() { gherkin_THEN "$@"; }

Original file line number	Diff line number	Diff line change
`@@ -542,6 +542,7 @@ gherkin_WHEN() {`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`gherkin_THEN() {`
	`545`	`+ local rc=$?`
`545`	`546`	`local COL=""`
`546`	`547`	`local NCOL=""`
`547`	`548`	`if is_terminal; then`
`@@ -556,6 +557,7 @@ gherkin_THEN() {`
`556`	`557`	`gherkin_last_msg="${gherkin_last_msg} ${COL}WHEN${NCOL} $gherkin_last_when\n"`
`557`	`558`	`gherkin_last_msg="${gherkin_last_msg} ${COL}THEN${NCOL} $gherkin_last_then"`
`558`	`559`	`echo ""`
	`560`	`+ return $rc`
`559`	`561`	`}`
`560`	`562`
`561`	`563`	`gherkin_AND() { gherkin_THEN "$@"; }`