Tack-Support/powerlevel10k
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777

Browse source 
Rbenv prompt option always displays #777
This commit is contained in:
Ben Hilburn 2018-04-13 22:04:50 -04:00 • committed by GitHub
commit 13b0e383a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
powerlevel9k.zsh-theme
View file

@ -1067,14 +1067,15 @@ prompt_ram() {
"$1_prompt_segment" "$0" "$2" "yellow" "$DEFAULT_COLOR" "$(printSizeHumanReadable "$ramfree" $base)" 'RAM_ICON'
}
set_default POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW false
# rbenv information
prompt_rbenv() {
if which rbenv 2>/dev/null >&2; then
if command which rbenv 2>/dev/null >&2; then
local rbenv_version_name="$(rbenv version-name)"
local rbenv_global="$(rbenv global)"
# Don't show anything if the current Ruby is the same as the global Ruby.
if [[ $rbenv_version_name == $rbenv_global ]]; then
if [[ $rbenv_version_name == $rbenv_global && "$POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW" = false ]]; then
return
fi
@ -1425,7 +1426,7 @@ prompt_kubecontext() {
if [[ -z "$k8s_namespace" ]]; then
k8s_namespace="default"
fi
local k8s_final_text=""
if [[ "$k8s_context" == "k8s_namespace" ]]; then
@ -1434,8 +1435,8 @@ prompt_kubecontext() {
else
k8s_final_text="$k8s_context/$k8s_namespace"
fi
"$1_prompt_segment" "$0" "$2" "magenta" "white" "$k8s_final_text" "KUBERNETES_ICON"
fi
}