github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use command and type instead of which (#2144)

Browse source 
`which` has been deprecated in Debian's debianutils 5.0+
They suggest using `type` and `command` as replacements:
3a8dd10b45 ,
610a65c6ef
This commit is contained in:
Ville Skyttä 2021-11-11 20:08:12 +02:00 committed by GitHub
parent 5b7c140f5b
commit a9e11ba164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/python-build/test/pyenv.bats
View file

@ -183,7 +183,7 @@ OUT
} }
@test "pyenv-install has usage help preface" { @test "pyenv-install has usage help preface" {
run head "$(which pyenv-install)" run head "$(command -v pyenv-install)"
assert_output_contains 'Usage: pyenv install' assert_output_contains 'Usage: pyenv install'
} }
@ -212,6 +212,6 @@ OUT
} }
@test "pyenv-uninstall has usage help preface" { @test "pyenv-uninstall has usage help preface" {
run head "$(which pyenv-uninstall)" run head "$(command -v pyenv-uninstall)"
assert_output_contains 'Usage: pyenv uninstall' assert_output_contains 'Usage: pyenv uninstall'
} }

4
test/test_helper.bash
View file

@ -116,12 +116,12 @@ path_without() {
local path=":${PATH}:" local path=":${PATH}:"
for exe; do for exe; do
local found alt util local found alt util
for found in $(PATH="$path" which -a "$exe"); do for found in $(PATH="$path" type -aP "$exe"); do
found="${found%/*}" found="${found%/*}"
if [ "$found" != "${PYENV_ROOT}/shims" ]; then if [ "$found" != "${PYENV_ROOT}/shims" ]; then
alt="${PYENV_TEST_DIR}/$(echo "${found#/}" | tr '/' '-')" alt="${PYENV_TEST_DIR}/$(echo "${found#/}" | tr '/' '-')"
mkdir -p "$alt" mkdir -p "$alt"
for util in bash head cut readlink greadlink which; do for util in bash head cut readlink greadlink; do
if [ -x "${found}/$util" ]; then if [ -x "${found}/$util" ]; then
ln -s "${found}/$util" "${alt}/$util" ln -s "${found}/$util" "${alt}/$util"
fi fi