Merge pull request #422 from rockandska/patch/try_catch_BATS_RUN_TMPDIR

Catch error if BATS_RUN_TMPDIR could not be created
bats-core · Apr 1, 2021 · 0b31b02 · 0b31b02
2 parents 2cf7bc6 + f0e39a1
commit 0b31b02
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/libexec/bats-core/bats b/libexec/bats-core/bats
@@ -205,14 +205,15 @@ if [[ -n "${BATS_RUN_TMPDIR:-}" ]];then
     printf "Error: BATS_RUN_TMPDIR (%s) already exists\n" "$BATS_RUN_TMPDIR" >&2
     printf "Reusing old run directories can lead to unexpected results ... aborting!\n" >&2
     exit 1
-  fi
-  if ! mkdir -p "$BATS_RUN_TMPDIR" ;then
+  elif ! mkdir -p "$BATS_RUN_TMPDIR" ;then
     printf "Error: Failed to create BATS_RUN_TMPDIR (%s)\n" "$BATS_RUN_TMPDIR" >&2
     exit 1
   fi
-else
-  BATS_RUN_TMPDIR=$(mktemp -d "${BATS_TMPDIR}/bats-run-$BATS_ROOT_PID-XXXXXX")
+elif ! BATS_RUN_TMPDIR=$(mktemp -d "${BATS_TMPDIR}/bats-run-$BATS_ROOT_PID-XXXXXX");then
+  printf "Error: Failed to create BATS_RUN_TMPDIR (%s) with mktemp\n" "${BATS_TMPDIR}/bats-run-$BATS_ROOT_PID-XXXXXX" >&2
+  exit 1
 fi
+
 if [[ -n "$BATS_TEMPDIR_CLEANUP" ]]; then
   trap 'rm -rf "$BATS_RUN_TMPDIR"' ERR EXIT
 fi