From 48752815ed5ea0689ed03bcd4b969a2c367de528 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 19 Nov 2021 13:14:02 +0100 Subject: [PATCH] [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 --- utils/lib_nvm.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/utils/lib_nvm.sh b/utils/lib_nvm.sh index c12be05cf..d35abef2a 100755 --- a/utils/lib_nvm.sh +++ b/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(){