Merge pull request #819 from blueyed/fix-path_without

tests: fix path_without to handle /bin properly
This commit is contained in:
Mislav Marohnić 2015-11-13 18:01:53 -05:00
commit fcedf169fb

View File

@ -111,7 +111,7 @@ assert() {
# but in which system utils necessary for rbenv operation are still available. # but in which system utils necessary for rbenv operation are still available.
path_without() { path_without() {
local exe="$1" local exe="$1"
local path="${PATH}:" local path=":${PATH}:"
local found alt util local found alt util
for found in $(which -a "$exe"); do for found in $(which -a "$exe"); do
found="${found%/*}" found="${found%/*}"
@ -123,8 +123,9 @@ path_without() {
ln -s "${found}/$util" "${alt}/$util" ln -s "${found}/$util" "${alt}/$util"
fi fi
done done
path="${path/${found}:/${alt}:}" path="${path/:${found}:/:${alt}:}"
fi fi
done done
path="${path#:}"
echo "${path%:}" echo "${path%:}"
} }