diff --git a/set-java-home.bash b/set-java-home.bash index a47d780..56218a7 100644 --- a/set-java-home.bash +++ b/set-java-home.bash @@ -1,25 +1,26 @@ -function absolute_dir_path { +function _asdf_java_absolute_dir_path { local absolute_path absolute_path="$( cd -P "$( dirname "$1" )" && pwd )" echo "$absolute_path" } -asdf_update_java_home() { +function _asdf_java_update_java_home() { local java_path java_path="$(asdf which java)" if [[ -n "${java_path}" ]]; then export JAVA_HOME - JAVA_HOME="$(dirname "$(absolute_dir_path "${java_path}")")" + JAVA_HOME="$(dirname "$(_asdf_java_absolute_dir_path "${java_path}")")" fi } -prompt_command() { +function _asdf_java_prompt_command() { if [[ "${PWD}" == "${LAST_PWD}" ]]; then return fi LAST_PWD="${PWD}" - asdf_update_java_home + _asdf_java_update_java_home } -export PROMPT_COMMAND="${PROMPT_COMMAND:+${PROMPT_COMMAND}; prompt_command}" -export PROMPT_COMMAND="${PROMPT_COMMAND:-prompt_command}" +if ! [[ "${PROMPT_COMMAND:-}" =~ _asdf_java_prompt_command ]]; then + PROMPT_COMMAND="_asdf_java_prompt_command${PROMPT_COMMAND:+;$PROMPT_COMMAND}" +fi