Skip to content

Commit 00c4857

Browse files
refactor(run_path): avoid carrying return_code across iterations (#2552)
Limit return_code to the per-script failure path instead of keeping it as loop state. This does not change current behavior, but makes the code easier to reason about and avoids future stale-state bugs if the loop logic is refactored. Signed-off-by: Josh <josh.t.richards@gmail.com>
1 parent 1b37fe5 commit 00c4857

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

docker-entrypoint.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ run_as() {
2222
# Execute all executable files in a given directory in alphanumeric order
2323
run_path() {
2424
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
25-
local return_code=0
2625
local found=0
2726

2827
echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
@@ -42,12 +41,11 @@ run_path() {
4241

4342
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
4443
found=$((found+1))
45-
run_as "${script_file_path}" || return_code="$?"
46-
47-
if [ "${return_code}" -ne "0" ]; then
44+
run_as "${script_file_path}" || {
45+
return_code="$?"
4846
echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
4947
exit 1
50-
fi
48+
}
5149

5250
echo "==> Finished executing the script: \"${script_file_path}\""
5351
done

0 commit comments

Comments
 (0)