Refactoring: make logic more fit for rearrangement

With functions, we have more leeway in what to call
This commit is contained in:
Ivan Pozdeev 2021-05-04 04:12:17 +03:00
parent 6656066d4f
commit 5998f4f7ab

View file

@ -43,7 +43,29 @@ fi
root="${0%/*}/.." root="${0%/*}/.."
if [ -z "$print" ]; then function main() {
case "$mode" in
"help")
help_
exit 1
;;
"path")
print_path
exit 0
;;
"print")
init_dirs
print_env
print_completion
print_shell_function
exit 0
;;
esac
# should never get here
exit 2
}
function help_() {
case "$shell" in case "$shell" in
bash ) bash )
if [ -f "${HOME}/.bashrc" ] && [ ! -f "${HOME}/.bash_profile" ]; then if [ -f "${HOME}/.bashrc" ] && [ ! -f "${HOME}/.bash_profile" ]; then
@ -79,12 +101,13 @@ if [ -z "$print" ]; then
esac esac
echo echo
} >&2 } >&2
}
exit 1 function init_dirs() {
fi
mkdir -p "${PYENV_ROOT}/"{shims,versions} mkdir -p "${PYENV_ROOT}/"{shims,versions}
}
function print_env() {
case "$shell" in case "$shell" in
fish ) fish )
echo "set -gx PATH '${PYENV_ROOT}/shims' \$PATH" echo "set -gx PATH '${PYENV_ROOT}/shims' \$PATH"
@ -95,7 +118,9 @@ fish )
echo "export PYENV_SHELL=$shell" echo "export PYENV_SHELL=$shell"
;; ;;
esac esac
}
function print_completion() {
completion="${root}/completions/pyenv.${shell}" completion="${root}/completions/pyenv.${shell}"
if [ -r "$completion" ]; then if [ -r "$completion" ]; then
echo "source '$completion'" echo "source '$completion'"
@ -104,7 +129,9 @@ fi
if [ -z "$no_rehash" ]; then if [ -z "$no_rehash" ]; then
echo 'command pyenv rehash 2>/dev/null' echo 'command pyenv rehash 2>/dev/null'
fi fi
}
function print_shell_function() {
commands=(`pyenv-commands --sh`) commands=(`pyenv-commands --sh`)
case "$shell" in case "$shell" in
fish ) fish )
@ -146,10 +173,15 @@ cat <<EOS
case "\$command" in case "\$command" in
${commands[*]}) ${commands[*]})
eval "\$(pyenv "sh-\$command" "\$@")";; eval "\$(pyenv "sh-\$command" "\$@")"
;;
*) *)
command pyenv "\$command" "\$@";; command pyenv "\$command" "\$@"
;;
esac esac
} }
EOS EOS
fi fi
}
main