Browse Source

[fix] make nvm.clean - don't raise error when NVM is not installed

Issue was::

    $ LANG=C make nvm.clean
    INFO:  NVM is not installed
    make: *** [Makefile:99: nvm.clean] Error 42

Now::

    $ LANG=C make nvm.clean
    CLEAN     [NVM] not installed

BTW: change info_msg to build_msg

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 3 years ago
parent
commit
48752815ed
1 changed files with 8 additions and 5 deletions
  1. 8 5
      utils/lib_nvm.sh

+ 8 - 5
utils/lib_nvm.sh

@@ -120,14 +120,17 @@ nvm.install() {
 
 nvm.clean() {
     if ! nvm.is_installed; then
-        info_msg "NVM is not installed"
-        return 42
+        build_msg CLEAN "[NVM] not installed"
+        return
     fi
     if ! nvm.is_local; then
-        info_msg "can't remove NVM from ${NVM_DIR}"
-        return 42
+        build_msg CLEAN "[NVM] can't remove nvm from ${NVM_DIR}"
+        return
+    fi
+    if [ -n "${NVM_DIR}" ]; then
+        build_msg CLEAN "[NVM] drop $(realpath --relative-to=. "${NVM_DIR}")/"
+        rm -rf "${NVM_DIR}"
     fi
-    rm -rf "${NVM_DIR}"
 }
 
 nvm.status(){