Merge 5913d222c5 into e38696a0ac

docs/themes-list/powerline-base.rst

@@ -81,7 +81,7 @@ The contents of the prompt can be "reordered", all the "segments" (every piece o
 * ``python_venv`` - Python virtual environment information (\ ``virtualenv``\ , ``venv``
   and ``conda`` supported)
 * ``ruby`` - Current ruby version if using ``rvm``
-* ``node`` - Current node version (only ``nvm`` is supported)
+* ``node`` - Current node version (``nvm`` is the default strategy; set ``NODE_VERSION_STRATEGY`` to ``node`` to use ``node --version``)
 * ``scm`` - Version control information, ``git``
 * ``terraform`` - Current terraform workspace
 * ``user_info`` - Current user

themes/base.theme.bash

@@ -74,6 +74,9 @@ SCM_NONE_CHAR='○'
 NVM_THEME_PROMPT_PREFIX=' |'
 NVM_THEME_PROMPT_SUFFIX='|'
 
+NODE_THEME_PROMPT_PREFIX=' |'
+NODE_THEME_PROMPT_SUFFIX='|'
+
 RVM_THEME_PROMPT_PREFIX=' |'
 RVM_THEME_PROMPT_SUFFIX='|'
 
@@ -399,8 +402,24 @@ function nvm_version_prompt() {
 	fi
 }
 
+function node_native_version_prompt() {
+	local node
+	if _command_exists node; then
+		node=$(node --version 2> /dev/null)
+		echo -ne "${NODE_THEME_PROMPT_PREFIX-}${node}${NODE_THEME_PROMPT_SUFFIX-}"
+	fi
+}
+
 function node_version_prompt() {
+	NODE_VERSION_STRATEGY="${NODE_VERSION_STRATEGY:-nvm}"
+
+	_log_debug "node: using version strategy '$NODE_VERSION_STRATEGY'"
+
+	if [ "$NODE_VERSION_STRATEGY" == "nvm" ]; then
 	    nvm_version_prompt
+	elif [ "$NODE_VERSION_STRATEGY" == "node" ]; then
+	    node_native_version_prompt
+	fi
 }
 
 function rvm_version_prompt() {

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

@@ -39,6 +39,8 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
+NODE_THEME_PROMPT_PREFIX=""
+NODE_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
 NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 

themes/powerline-naked/powerline-naked.theme.bash

@@ -34,6 +34,8 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
+NODE_THEME_PROMPT_PREFIX=""
+NODE_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
 NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 

themes/powerline-plain/powerline-plain.theme.bash

@@ -31,6 +31,8 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
+NODE_THEME_PROMPT_PREFIX=""
+NODE_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
 NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}
 

themes/powerline/powerline.theme.bash

@@ -37,6 +37,8 @@ SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
 
 NVM_THEME_PROMPT_PREFIX=""
 NVM_THEME_PROMPT_SUFFIX=""
+NODE_THEME_PROMPT_PREFIX=""
+NODE_THEME_PROMPT_SUFFIX=""
 NODE_CHAR=${POWERLINE_NODE_CHAR:="❲n❳ "}
 NODE_THEME_PROMPT_COLOR=${POWERLINE_NODE_COLOR:=22}