Merge pull request #2328 from seefood/fix/superfuncy

Author: seefood

themes/base.theme.bash

@@ -404,31 +404,20 @@ function node_command_version_prompt() {
 	fi
 }
 
-function node_version_prompt() {
-	local node_version
-	node_version="$(nvm_version_prompt)"
-	if [[ -z "${node_version}" ]]; then
-		node_version="$(node_command_version_prompt)"
-	fi
-	if [[ -n "${node_version}" ]]; then
-		echo -e "${node_version}"
-	fi
-}
-
 function nvm_version_prompt() {
-	local node
+	local nvm_ver
 	if _is_function nvm; then
-		node=$(nvm current 2> /dev/null)
-		[[ "${node}" == "system" ]] && return
-		echo -ne "${NVM_THEME_PROMPT_PREFIX-}${node}${NVM_THEME_PROMPT_SUFFIX-}"
+		nvm_ver=$(nvm current 2> /dev/null)
+		[[ "${nvm_ver}" == "system" ]] && return
+		echo -ne "${NVM_THEME_PROMPT_PREFIX-}${nvm_ver}${NVM_THEME_PROMPT_SUFFIX-}"
 	fi
 }
 
 function node_native_version_prompt() {
-	local node
+	local node_ver
 	if _command_exists node; then
-		node=$(node --version 2> /dev/null)
-		echo -ne "${NODE_THEME_PROMPT_PREFIX-}${node}${NODE_THEME_PROMPT_SUFFIX-}"
+		node_ver=$(node --version 2> /dev/null)
+		echo -ne "${NODE_THEME_PROMPT_PREFIX-}${node_ver}${NODE_THEME_PROMPT_SUFFIX-}"
 	fi
 }