aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Ritter <dritter03@googlemail.com>2019-02-01 13:09:42 +0300
committerDominik Ritter <dritter03@googlemail.com>2019-02-01 13:09:42 +0300
commit2f05bbbb475fb032b9881a859ef4257c23274e8d (patch)
treef6f9a69ee866add31295fd272f462d9b61dcc2c3
parent6ccdfdf37e47f67683c016426cac89c6a3ac9fb0 (diff)
Remove checking for NODEENV_DISABLE_PROMPT
This variable is none of our buisness.
-rwxr-xr-xpowerlevel9k.zsh-theme5
-rwxr-xr-xtest/segments/nodeenv.spec20
2 files changed, 2 insertions, 23 deletions
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 383a3b91..a4ac080a 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -1238,9 +1238,8 @@ prompt_nvm() {
################################################################
# Segment to display NodeEnv
prompt_nodeenv() {
- local nodeenv_path="$NODE_VIRTUAL_ENV"
- if [[ -n "$nodeenv_path" && "$NODE_VIRTUAL_ENV_DISABLE_PROMPT" != true ]]; then
- local info="$(node -v)[$(basename "$nodeenv_path")]"
+ if [[ -n "$NODE_VIRTUAL_ENV" ]]; then
+ local info="$(node -v)[${NODE_VIRTUAL_ENV:t}]"
"$1_prompt_segment" "$0" "$2" "black" "green" "$info" 'NODE_ICON'
fi
}
diff --git a/test/segments/nodeenv.spec b/test/segments/nodeenv.spec
index 2e9d779e..1a9aaba8 100755
--- a/test/segments/nodeenv.spec
+++ b/test/segments/nodeenv.spec
@@ -44,26 +44,6 @@ function testNodeenvSegmentPrintsNothingIfNodeVirtualEnvIsNotSet() {
unfunction node
}
-function testNodeenvSegmentPrintsNothingIfNodeVirtualEnvDisablePromptIsSet() {
- local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
- POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(nodeenv custom_world)
- local POWERLEVEL9K_CUSTOM_WORLD='echo world'
- node() {
- echo "v1.2.3"
- }
- NODE_VIRTUAL_ENV="node-env"
- NODE_VIRTUAL_ENV_DISABLE_PROMPT=true
-
- # Load Powerlevel9k
- source powerlevel9k.zsh-theme
-
- assertEquals "%K{007} %F{000}world %k%F{007}%f " "$(build_left_prompt)"
-
- unset NODE_VIRTUAL_ENV_DISABLE_PROMPT
- unset NODE_VIRTUAL_ENV
- unfunction node
-}
-
function testNodeenvSegmentPrintsAtLeastNodeEnvWithoutNode() {
local -a POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(nodeenv)