mirror of
https://github.com/pyenv/pyenv.git
synced 2025-11-10 04:23:47 -05:00
Allow for cases where user might've aliased some programs
The $(type -p | head -1) construct expects to always get a path, so need to ignore such aliases with -P Closes https://github.com/pyenv/pyenv/issues/1662
This commit is contained in:
@@ -89,7 +89,7 @@ install_tmp_fixture() {
|
||||
}
|
||||
|
||||
resolve_link() {
|
||||
$(type -p greadlink readlink | head -1) "$1"
|
||||
$(type -P greadlink readlink | head -1) "$1"
|
||||
}
|
||||
|
||||
run_inline_definition_with_name() {
|
||||
|
||||
@@ -130,7 +130,7 @@ assert_output_contains() {
|
||||
echo "assert_output_contains needs an argument" >&2
|
||||
return 1
|
||||
fi
|
||||
echo "$output" | $(type -p ggrep grep | head -1) -F "$expected" >/dev/null || {
|
||||
echo "$output" | $(type -P ggrep grep | head -1) -F "$expected" >/dev/null || {
|
||||
{ echo "expected output to contain $expected"
|
||||
echo "actual: $output"
|
||||
} | flunk
|
||||
|
||||
Reference in New Issue
Block a user