Merge pull request #2035 from pyenv/revert-2027-master

Revert "Adapt conda.bash for bash associative array"
This commit is contained in:
Anton Petrov 2021-08-20 14:18:30 +03:00 committed by GitHub
commit 4f8b15fecd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -34,22 +34,14 @@ make_shims() {
} }
deregister_conda_shims() { deregister_conda_shims() {
if [[ -v registered_shims[@] ]]; then # adapted for Bash 4.x's associative array (#1749) local shim
for shim in ${!registered_shims[*]}; do local shims=()
if conda_shim "${shim}" 1>&2; then for shim in ${registered_shims}; do
unset registered_shims[${shim}] if ! conda_shim "${shim}" 1>&2; then
fi shims[${#shims[*]}]="${shim}"
done fi
else done
local shim registered_shims=" ${shims[@]} "
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