ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[fix] make nvm.env exit with error when VERBOSE is unset 

$ make nvm.install
    INFO:  install (update) NVM at /800GBPCIex4/share/SearXNG/.nvm
    INFO:  already cloned at: /800GBPCIex4/share/SearXNG/.nvm
      || Fetching origin
    INFO:  checkout v0.39.1
      || HEAD is now at 9600617 v0.39.1
    make: *** [Makefile:96: nvm.install] Error 1

Without this fix we need to set VERBOSE environment to avoid the 'Error 1':

    $ VERBOSE=0 make nvm.install

BTW: fix an issue if there are any leftovers in ${NVM_DIR} from previos
installations

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-09-23 18:21:41 +02:00
parent 2cf1425e8b
commit eebb489fb7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/lib_nvm.sh
View File

@ -27,6 +27,7 @@ nvm.env() {
source "${NVM_DIR}/nvm.sh" source "${NVM_DIR}/nvm.sh"
source "${NVM_DIR}/bash_completion" source "${NVM_DIR}/bash_completion"
[ "$VERBOSE" = "1" ] && info_msg "sourced NVM environment from ${NVM_DIR}" [ "$VERBOSE" = "1" ] && info_msg "sourced NVM environment from ${NVM_DIR}"
return 0
} }
nvm.is_installed() { nvm.is_installed() {
@ -102,11 +103,15 @@ EOF
nvm.install() { nvm.install() {
local NVM_VERSION_TAG local NVM_VERSION_TAG
info_msg "install (update) NVM at ${NVM_DIR}" info_msg "install (update) NVM at ${NVM_DIR}"
if [[ -d "${NVM_DIR}" ]] ; then if nvm.is_installed; then
info_msg "already cloned at: ${NVM_DIR}" info_msg "already cloned at: ${NVM_DIR}"
pushd "${NVM_DIR}" &> /dev/null pushd "${NVM_DIR}" &> /dev/null
git fetch --all | prefix_stdout " ${_Yellow}||${_creset} " git fetch --all | prefix_stdout " ${_Yellow}||${_creset} "
else else
# delete any leftovers from previos installations
if nvm.is_local; then
rm -rf "${NVM_DIR}"
fi
info_msg "clone: ${NVM_GIT_URL}" info_msg "clone: ${NVM_GIT_URL}"
git clone "${NVM_GIT_URL}" "${NVM_DIR}" 2>&1 | prefix_stdout " ${_Yellow}||${_creset} " git clone "${NVM_GIT_URL}" "${NVM_DIR}" 2>&1 | prefix_stdout " ${_Yellow}||${_creset} "
pushd "${NVM_DIR}" &> /dev/null pushd "${NVM_DIR}" &> /dev/null