Skip to content

Commit be4d096

Browse files
authored
Merge pull request #1946 from kigster/kig/nodejs-version
2 parents 7a4e86d + 7a0b127 commit be4d096

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

themes/base.theme.bash

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,27 @@ function hg_prompt_vars() {
394394
fi
395395
}
396396

397+
function node_command_version_prompt() {
398+
local node_version
399+
if _command_exists node; then
400+
node_version="$(node --version 2> /dev/null)"
401+
if [[ -n ${node_version} ]]; then
402+
echo -e "${NVM_THEME_PROMPT_PREFIX}${node_version}${NVM_THEME_PROMPT_SUFFIX}"
403+
fi
404+
fi
405+
}
406+
407+
function node_version_prompt() {
408+
local node_version
409+
node_version="$(nvm_version_prompt)"
410+
if [[ -z "${node_version}" ]]; then
411+
node_version="$(node_command_version_prompt)"
412+
fi
413+
if [[ -n "${node_version}" ]]; then
414+
echo -e "${node_version}"
415+
fi
416+
}
417+
397418
function nvm_version_prompt() {
398419
local node
399420
if _is_function nvm; then

themes/powerline-multiline/powerline-multiline.theme.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ NVM_THEME_PROMPT_SUFFIX=""
4545
NODE_THEME_PROMPT_PREFIX=""
4646
NODE_THEME_PROMPT_SUFFIX=""
4747
NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
48-
NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
48+
NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=28}
4949

5050
RVM_THEME_PROMPT_PREFIX=""
5151
RVM_THEME_PROMPT_SUFFIX=""
5252
RBENV_THEME_PROMPT_PREFIX=""
5353
RBENV_THEME_PROMPT_SUFFIX=""
54-
RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=161}
54+
RUBY_THEME_PROMPT_COLOR=${POWERLINE_RUBY_COLOR:=1}
5555
RUBY_CHAR=${POWERLINE_RUBY_CHAR:="❲r❳ "}
5656

5757
TERRAFORM_THEME_PROMPT_COLOR=${POWERLINE_TERRAFORM_COLOR:=161}

0 commit comments

Comments
 (0)