Don't load if old version already present (Fixes #146) (#150)

rcaloras · Jan 24, 2024 · f872f3f · f872f3f
1 parent fb23d47
commit f872f3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bash-preexec.sh b/bash-preexec.sh
@@ -48,7 +48,7 @@ if [[ -z "${BASH_VERSINFO-}" ]] || (( BASH_VERSINFO[0] < 3 || (BASH_VERSINFO[0]
 fi
 
 # Avoid duplicate inclusion
-if [[ -n "${bash_preexec_imported:-}" ]]; then
+if [[ -n "${bash_preexec_imported:-}" || -n "${__bp_imported:-}" ]]; then
     return 0
 fi
 bash_preexec_imported="defined"

diff --git a/test/include-test.bats b/test/include-test.bats
@@ -6,6 +6,12 @@
   [ -z $(type -t __bp_install) ]
 }
 
+@test "should not import if it's already defined (old guard, don't use elsewhere!)" {
+  __bp_imported="defined"
+  source "${BATS_TEST_DIRNAME}/../bash-preexec.sh"
+  [ -z $(type -t __bp_install) ]
+}
+
 @test "should import if not defined" {
   unset bash_preexec_imported
   source "${BATS_TEST_DIRNAME}/../bash-preexec.sh"