From 72d5ffaa4fee1af755dda5f5779713919208c6b9 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Sat, 9 Nov 2019 12:35:17 -0800
Subject: [PATCH] Only add npm path if it exists

---
 assets/default/dotfiles/bashrc      | 8 +++++---
 assets/default/fish/init/paths.fish | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/assets/default/dotfiles/bashrc b/assets/default/dotfiles/bashrc
index de460e3..c1ec86c 100644
--- a/assets/default/dotfiles/bashrc
+++ b/assets/default/dotfiles/bashrc
@@ -66,10 +66,12 @@ elif [ -d "$HOME/.rvm" ]; then
 fi
 
 # NPM paths
-# On mac the path should already be taken care of
-if type npm &> /dev/null && [ $DET_OS != "mac" ]; then
+if type npm &> /dev/null ; then
     # This seems to fail in some cases
-    export PATH=$PATH:$(npm bin -g 2> /dev/null)
+    npm_path=$(npm bin -g 2> /dev/null)
+    if [ -d "$npm_path" ] && echo $PATH | grep -qv "$npm_path"; then
+        export PATH=$npm_path:$PATH
+    fi
 fi
 
 # Increase memory sizes for java using Ant
diff --git a/assets/default/fish/init/paths.fish b/assets/default/fish/init/paths.fish
index 55955ff..f196b12 100644
--- a/assets/default/fish/init/paths.fish
+++ b/assets/default/fish/init/paths.fish
@@ -31,7 +31,10 @@ end
 
 # NPM paths
 if type -q npm
-    set -gx PATH (npm bin -g 2> /dev/null) $PATH
+    set npm_path (npm bin -g 2> /dev/null)
+    if [ -d "$npm_path" ]
+        set -gx PATH $npm_path $PATH
+    end
 end
 
 # Add rust path