mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-07 20:31:01 -05:00
I should have used basename only to check shims
This commit is contained in:
parent
753a9e826b
commit
e9ad498fe3
2 changed files with 2 additions and 2 deletions
|
@ -19,7 +19,7 @@ for shim in $(cat "${BASH_SOURCE%/*}/conda.d/"*".list" | sort | uniq | sed -e 's
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
shopt -u nullglob
|
shopt -u nullglob
|
||||||
eval "conda_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
|
eval "conda_shim(){ case \"\${1##*/}\" in ${shims[@]} *)return 1;;esac;}"
|
||||||
|
|
||||||
# override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
|
# override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
|
||||||
# https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash
|
# https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash
|
||||||
|
|
|
@ -8,7 +8,7 @@ for shim in $(cat "${BASH_SOURCE%/*}/source.d/"*".list" | sort | uniq | sed -e '
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
shopt -u nullglob
|
shopt -u nullglob
|
||||||
eval "source_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}"
|
eval "source_shim(){ case \"\${1##*/}\" in ${shims[@]} *)return 1;;esac;}"
|
||||||
|
|
||||||
cat > "${PROTOTYPE_SOURCE_SHIM_PATH}" <<SH
|
cat > "${PROTOTYPE_SOURCE_SHIM_PATH}" <<SH
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
Loading…
Reference in a new issue