From e8e9d51f9d77f816df40339993fc6624d0120356 Mon Sep 17 00:00:00 2001 From: Nathaniel Landau Date: Mon, 6 Sep 2021 10:36:55 -0400 Subject: [PATCH] Cnofirm directories exist before adding to PATH --- test/baseHelpers.bats | 7 ++++--- utilities/baseHelpers.bash | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/baseHelpers.bats b/test/baseHelpers.bats index a4abaef..deb2b3c 100755 --- a/test/baseHelpers.bats +++ b/test/baseHelpers.bats @@ -237,10 +237,11 @@ _testSeekConfirmation_() { _testSetPATH_() { @test "_setPATH_" { - _setPATH_ "/testing/from/bats" "/testing/again" - run echo "$PATH" + mkdir -p "${TESTDIR}/testing/from/bats" + _setPATH_ "${TESTDIR}/testing/from/bats" "${TESTDIR}/testing/again" + run echo "${PATH}" assert_output --regexp "/testing/from/bats" - assert_output --regexp "/testing/again" + refute_output --regexp "/testing/again" } } diff --git a/utilities/baseHelpers.bash b/utilities/baseHelpers.bash index 14c35ff..39ce679 100644 --- a/utilities/baseHelpers.bash +++ b/utilities/baseHelpers.bash @@ -326,9 +326,11 @@ _setPATH_() { done for NEWPATH in "${NEWPATHS[@]}"; do - if ! echo "$PATH" | grep -Eq "(^|:)${NEWPATH}($|:)"; then - PATH="${NEWPATH}:${PATH}" - debug "Added '${tan}${NEWPATH}${purple}' to PATH" + if [ -d "${NEWPATH}" ]; then + if ! echo "$PATH" | grep -Eq "(^|:)${NEWPATH}($|:)"; then + PATH="${NEWPATH}:${PATH}" + debug "Added '${NEWPATH}' to PATH" + fi fi done }