From a21b2e69621dc1078e9843d348ed3725a401ae6e Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 28 Jun 2015 18:08:38 -0700 Subject: [PATCH] Refactor this `nvm use` `case` statement out into an `nvm_match_version` function. --- nvm.sh | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/nvm.sh b/nvm.sh index e81f012..1c742d6 100755 --- a/nvm.sh +++ b/nvm.sh @@ -1094,6 +1094,24 @@ nvm_install_node_source() { return $? } +nvm_match_version() { + local NVM_IOJS_PREFIX + NVM_IOJS_PREFIX="$(nvm_iojs_prefix)" + local PROVIDED_VERSION + PROVIDED_VERSION="$1" + case "_$PROVIDED_VERSION" in + "_$NVM_IOJS_PREFIX" | "_io.js") + echo "$(nvm_version $NVM_IOJS_PREFIX)" + ;; + "_system") + echo "system" + ;; + *) + echo "$(nvm_version "$PROVIDED_VERSION")" + ;; + esac +} + nvm() { if [ $# -lt 1 ]; then nvm help @@ -1383,22 +1401,8 @@ nvm() { VERSION="$(nvm_version "$PROVIDED_VERSION")" fi else - local NVM_IOJS_PREFIX - NVM_IOJS_PREFIX="$(nvm_iojs_prefix)" - local NVM_NODE_PREFIX - NVM_NODE_PREFIX="$(nvm_node_prefix)" PROVIDED_VERSION="$2" - case "_$PROVIDED_VERSION" in - "_$NVM_IOJS_PREFIX" | "_io.js") - VERSION="$(nvm_version $NVM_IOJS_PREFIX)" - ;; - "_system") - VERSION="system" - ;; - *) - VERSION="$(nvm_version "$PROVIDED_VERSION")" - ;; - esac + VERSION="$(nvm_match_version "$PROVIDED_VERSION")" fi if [ -z "$VERSION" ]; then