From 4d2faba9afc96b44de5368d5a60239f708e642df Mon Sep 17 00:00:00 2001
From: Tarcisio Gruppi <txgruppi@gmail.com>
Date: Tue, 31 Dec 2013 22:35:19 -0200
Subject: [PATCH 1/3] export NODE_PATH on nvm use

---
 nvm.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nvm.sh b/nvm.sh
index 45ba6d8..b570c49 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -421,6 +421,7 @@ nvm() {
       export MANPATH
       export NVM_PATH="$NVM_DIR/$VERSION/lib/node"
       export NVM_BIN="$NVM_DIR/$VERSION/bin"
+      export NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules"
       echo "Now using node $VERSION"
     ;;
     "run" )

From 58dafdaedd6f5ae12b5f4e257d966b2f853aa04e Mon Sep 17 00:00:00 2001
From: Tarcisio Gruppi <txgruppi@gmail.com>
Date: Wed, 1 Jan 2014 02:04:37 -0200
Subject: [PATCH 2/3] Update NODE_PATH on use, run and deactivate

---
 nvm.sh | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/nvm.sh b/nvm.sh
index b570c49..ef2eb9f 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -377,6 +377,12 @@ nvm() {
       else
         echo "Could not find $NVM_DIR/*/share/man in \$MANPATH"
       fi
+      if [[ $NODE_PATH == *$NVM_DIR/*/lib/node_modules* ]]; then
+        export NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}${NODE_PATH#*$NVM_DIR/*/lib/node_modules:}
+        echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH"
+      else
+        echo "Could not find $NVM_DIR/*/lib/node_modules in \$NODE_PATH"
+      fi
     ;;
     "use" )
       if [ $# -eq 0 ]; then
@@ -416,12 +422,17 @@ nvm() {
       else
         MANPATH="$NVM_DIR/$VERSION/share/man:$MANPATH"
       fi
+      if [[ $NODE_PATH == *$NVM_DIR/*/lib/node_modules* ]]; then
+        NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}$NVM_DIR/$VERSION/lib/node_modules${NODE_PATH#*$NVM_DIR/*/lib/node_modules}
+      else
+        NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules:$NODE_PATH"
+      fi
       export PATH
       hash -r
       export MANPATH
+      export NODE_PATH
       export NVM_PATH="$NVM_DIR/$VERSION/lib/node"
       export NVM_BIN="$NVM_DIR/$VERSION/bin"
-      export NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules"
       echo "Now using node $VERSION"
     ;;
     "run" )
@@ -435,8 +446,16 @@ nvm() {
         echo "$VERSION version is not installed yet"
         return;
       fi
+      PREVIOUS_NODE_PATH=$NODE_PATH
+      if [[ $NODE_PATH == *$NVM_DIR/*/lib/node_modules* ]]; then
+        NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}$NVM_DIR/$VERSION/lib/node_modules${NODE_PATH#*$NVM_DIR/*/lib/node_modules}
+      else
+        NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules:$NODE_PATH"
+      fi
+      export NODE_PATH
       echo "Running node $VERSION"
       $NVM_DIR/$VERSION/bin/node "${@:3}"
+      export NODE_PATH=$PREVIOUS_NODE_PATH
     ;;
     "ls" | "list" )
       print_versions "`nvm_ls $2`"

From eb588566f255df3de03d6f3758136f76df335151 Mon Sep 17 00:00:00 2001
From: Tarcisio Gruppi <txgruppi@gmail.com>
Date: Mon, 13 Jan 2014 09:15:45 -0200
Subject: [PATCH 3/3] Removed PREVIOUS_NODE_PATH

---
 nvm.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nvm.sh b/nvm.sh
index ef2eb9f..829f579 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -446,16 +446,13 @@ nvm() {
         echo "$VERSION version is not installed yet"
         return;
       fi
-      PREVIOUS_NODE_PATH=$NODE_PATH
       if [[ $NODE_PATH == *$NVM_DIR/*/lib/node_modules* ]]; then
-        NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}$NVM_DIR/$VERSION/lib/node_modules${NODE_PATH#*$NVM_DIR/*/lib/node_modules}
+        RUN_NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}$NVM_DIR/$VERSION/lib/node_modules${NODE_PATH#*$NVM_DIR/*/lib/node_modules}
       else
-        NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules:$NODE_PATH"
+        RUN_NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules:$NODE_PATH"
       fi
-      export NODE_PATH
       echo "Running node $VERSION"
-      $NVM_DIR/$VERSION/bin/node "${@:3}"
-      export NODE_PATH=$PREVIOUS_NODE_PATH
+      NODE_PATH=$RUN_NODE_PATH $NVM_DIR/$VERSION/bin/node "${@:3}"
     ;;
     "ls" | "list" )
       print_versions "`nvm_ls $2`"