Reuse BATS_SAVED_PATH

2 files changed, 6 insertions, 3 deletions

diff --git a/load.bash b/load.bash
index 62c4622..3f52722 100644
--- a/load.bash
+++ b/load.bash
@@ -1,7 +1,10 @@
 # Preserve path at the time this file was sourced
 # This prevents using of user-defined mocks/stubs that modify the PATH
 
-_BATSLIB_PATH="$PATH"
+# BATS_SAVED_PATH was introduced in bats-core v1.10.0
+# if it is already set, we can use its more robust value
+# else we try to recreate it here
+BATS_SAVED_PATH="${BATS_SAVED_PATH-$PATH}"
 
 source "$(dirname "${BASH_SOURCE[0]}")/src/output.bash"
 source "$(dirname "${BASH_SOURCE[0]}")/src/error.bash"
diff --git a/src/output.bash b/src/output.bash
index 6d260b1..bb3ff4a 100644
--- a/src/output.bash
+++ b/src/output.bash
@@ -38,7 +38,7 @@ batslib_err() {
   { if (( $# > 0 )); then
       echo "$@"
     else
-      ( PATH="$_BATSLIB_PATH"; command cat -; )
+      ( PATH="$BATS_SAVED_PATH"; command cat -; )
     fi
   } >&2
 }
@@ -273,7 +273,7 @@ batslib_mark() {
 batslib_decorate() {
   echo
   echo "-- $1 --"
-  ( PATH="$_BATSLIB_PATH"; command cat -; )
+  ( PATH="$BATS_SAVED_PATH"; command cat -; )
   echo '--'
   echo
 }