mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-07 20:31:01 -05:00
fixes checking of associative array in conda.bash
This commit is contained in:
parent
4f8b15fecd
commit
dfeda54079
1 changed files with 17 additions and 8 deletions
|
@ -34,14 +34,23 @@ make_shims() {
|
||||||
}
|
}
|
||||||
|
|
||||||
deregister_conda_shims() {
|
deregister_conda_shims() {
|
||||||
local shim
|
# adapted for Bash 4.x's associative array (#1749)
|
||||||
local shims=()
|
if declare -p registered_shims 2> /dev/null | grep -Eq '^(declare|typeset) \-A'; then
|
||||||
for shim in ${registered_shims}; do
|
for shim in ${!registered_shims[*]}; do
|
||||||
if ! conda_shim "${shim}" 1>&2; then
|
if conda_shim "${shim}" 1>&2; then
|
||||||
shims[${#shims[*]}]="${shim}"
|
unset registered_shims[${shim}]
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
registered_shims=" ${shims[@]} "
|
else
|
||||||
|
local shim
|
||||||
|
local shims=()
|
||||||
|
for shim in ${registered_shims}; do
|
||||||
|
if ! conda_shim "${shim}" 1>&2; then
|
||||||
|
shims[${#shims[*]}]="${shim}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
registered_shims=" ${shims[@]} "
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
if conda_exists; then
|
if conda_exists; then
|
||||||
|
|
Loading…
Reference in a new issue