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

rehash: use associative array to hold registered shims

Browse source 
"hyperfine pyenv-rehash" before on my bash 4.4:

Time (mean ± σ):   172.8 ms ±   8.2 ms [User: 185.0 ms, System: 24.8 ms]
Range (min … max): 164.2 ms … 198.4 ms 15 runs

After:

Time (mean ± σ):   113.8 ms ±   2.8 ms [User: 127.1 ms, System: 26.1 ms]
Range (min … max): 108.0 ms … 117.6 ms 25 runs
This commit is contained in:
Ville Skyttä 2020-12-05 14:36:52 +02:00
parent b7efafe599
commit a804887307
1 changed files with 53 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
libexec/pyenv-rehash
View file

@ -123,34 +123,62 @@ make_shims() {
done done
} }
registered_shims=" " if ((${BASH_VERSINFO[0]} > 3)); then
# Registers the name of a shim to be generated. declare -A registered_shims
register_shim() {
registered_shims="${registered_shims}${1} "
}
# Install all the shims registered via `make_shims` or `register_shim` directly. # Registers the name of a shim to be generated.
install_registered_shims() { register_shim() {
local shim file registered_shims["$1"]=1
for shim in $registered_shims; do }
file="${SHIM_PATH}/${shim}"
[ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
done
}
# Once the registered shims have been installed, we make a second pass # Install all shims registered via `make_shims` or `register_shim` directly.
# over the contents of the shims directory. Any file that is present install_registered_shims() {
# in the directory but has not been registered as a shim should be local shim file
# removed. for shim in "${!registered_shims[@]}"; do
remove_stale_shims() { file="${SHIM_PATH}/${shim}"
local shim [ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
for shim in "$SHIM_PATH"/*; do done
if [[ "$registered_shims" != *" ${shim##*/} "* ]]; then }
rm -f "$shim"
fi # Once the registered shims have been installed, we make a second pass
done # over the contents of the shims directory. Any file that is present
} # in the directory but has not been registered as a shim should be
# removed.
remove_stale_shims() {
local shim
for shim in "$SHIM_PATH"/*; do
if [[ ! ${registered_shims["${shim##*/}"]} ]]; then
rm -f "$shim"
fi
done
}
else # Same for bash < 4.
registered_shims=" "
register_shim() {
registered_shims="${registered_shims}${1} "
}
install_registered_shims() {
local shim file
for shim in $registered_shims; do
file="${SHIM_PATH}/${shim}"
[ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
done
}
remove_stale_shims() {
local shim
for shim in "$SHIM_PATH"/*; do
if [[ "$registered_shims" != *" ${shim##*/} "* ]]; then
rm -f "$shim"
fi
done
}
fi
shopt -s nullglob shopt -s nullglob