From 3f5ce8b93a114a99f24e2ce884b5d379346906c8 Mon Sep 17 00:00:00 2001 From: niris Date: Fri, 2 Jan 2015 09:47:26 +0800 Subject: [PATCH 1/2] Fix which command in zsh (#604). --- nvm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvm.sh b/nvm.sh index 5884872..09059c5 100644 --- a/nvm.sh +++ b/nvm.sh @@ -272,7 +272,7 @@ nvm_alias() { nvm_ls_current() { local NVM_LS_CURRENT_NODE_PATH - NVM_LS_CURRENT_NODE_PATH="$(which node 2> /dev/null)" + NVM_LS_CURRENT_NODE_PATH="$(command which node 2> /dev/null)" if [ $? -ne 0 ]; then echo 'none' elif nvm_tree_contains_path "$NVM_DIR" "$NVM_LS_CURRENT_NODE_PATH"; then @@ -984,7 +984,7 @@ nvm() { if [ "_$VERSION" = '_system' ]; then if nvm_has_system_node >/dev/null 2>&1; then local NVM_BIN - NVM_BIN="$(nvm use system >/dev/null 2>&1 && which node)" + NVM_BIN="$(nvm use system >/dev/null 2>&1 && command which node)" if [ -n "$NVM_BIN" ]; then echo "$NVM_BIN" return From a26007ec0d80e7ed6808e37f75db7bb80a767a8d Mon Sep 17 00:00:00 2001 From: niris Date: Fri, 2 Jan 2015 12:51:59 +0800 Subject: [PATCH 2/2] fix test suit --- test/fast/Unit tests/nvm_ls_current | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fast/Unit tests/nvm_ls_current b/test/fast/Unit tests/nvm_ls_current index 59f0a60..2678cff 100755 --- a/test/fast/Unit tests/nvm_ls_current +++ b/test/fast/Unit tests/nvm_ls_current @@ -12,8 +12,8 @@ TEST_PWD=$(pwd) TEST_DIR="$TEST_PWD/nvm_ls_current_tmp" rm -rf "$TEST_DIR" mkdir "$TEST_DIR" -ln -s "$(which which)" "$TEST_DIR/which" -ln -s "$(which dirname)" "$TEST_DIR/dirname" +ln -s "$(command which which)" "$TEST_DIR/which" +ln -s "$(command which dirname)" "$TEST_DIR/dirname" [ "$(PATH="$TEST_DIR" nvm_ls_current)" = "none" ] || die 'when node not installed, nvm_ls_current did not return "none"' [ "@$(PATH="$TEST_DIR" nvm_ls_current 2> /dev/stdout 1> /dev/null)@" = "@@" ] || die 'when node not installed, nvm_ls_current returned error output'