Bladeren bron

clean up and personalize lazy-nvm

Tom McKenzie 5 jaren geleden
bovenliggende
commit
77ef31fe1e
2 gewijzigde bestanden met toevoegingen van 11 en 16 verwijderingen
  1. 1 13
      .rc.d/applications.sh
  2. 10 3
      .rc.d/lazy-nvm.sh

+ 1 - 13
.rc.d/applications.sh

@@ -1,13 +1,6 @@
 #!/bin/bash
 
-# nvm
-if [ -d "${HOME}/.nvm" ]; then
-#   see .rc.d/lazy-npm.sh
-#   export NVM_DIR="$HOME/.nvm"
-#   [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # linux
-#   [ -s "$(brew --prefix nvm)/nvm.sh" ] && source $(brew --prefix nvm)/nvm.sh # osx
-  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # nvm bash_completion
-fi
+# nvm: see .rc.d/lazy-nvm.sh
 
 # export golang bin path
 if [ -d "$HOME/go" ]; then
@@ -20,8 +13,3 @@ if [ -d "$HOME/.rbenv" ]; then
   export PATH="$HOME/.rbenv/bin:$PATH"
   eval "$(rbenv init -)"
 fi
-
-# node-prototype-repl (node >13)
-if [[ -n "$(command -v node-prototype-repl)" ]]; then
-  export NODE_REPL_EXTERNAL_MODULE=$(which node-prototype-repl)
-fi

+ 10 - 3
.rc.d/lazy-nvm.sh

@@ -6,9 +6,16 @@ function lazy_nvm {
   unset -f node
   unset -f npx
 
-  export NVM_DIR="$HOME/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # linux
-  [ -s "$(brew --prefix nvm)/nvm.sh" ] && source $(brew --prefix nvm)/nvm.sh # osx
+  if [ -d "${HOME}/.nvm" ]; then
+    export NVM_DIR="$HOME/.nvm"
+    [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # linux
+    [ -s "$(brew --prefix nvm)/nvm.sh" ] && source $(brew --prefix nvm)/nvm.sh # osx
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # nvm bash_completion
+  fi
+  # node-prototype-repl (node >13)
+  if [[ -n "$(command -v node-prototype-repl)" ]]; then
+    export NODE_REPL_EXTERNAL_MODULE=$(which node-prototype-repl)
+  fi
 }
 
 # aliases