3 files changed, 18 insertions, 8 deletions
diff --git a/utils/filtron.sh b/utils/filtron.sh
index ff380a327..2536214e4 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -337,7 +337,8 @@ EOF
     echo "export SERVICE_HOME=$SERVICE_HOME"
 
     tee_stderr <<EOF | sudo -i -u "$SERVICE_USER"
-grep -qFs -- 'source $GO_ENV' ~/.profile || echo 'source $GO_ENV' >> ~/.profile
+touch "$GO_ENV"
+grep -qFs -- 'source "$GO_ENV"' ~/.profile || echo 'source "$GO_ENV"' >> ~/.profile
 EOF
 }
 
@@ -348,13 +349,13 @@ filtron_is_installed() {
 install_filtron() {
     rst_title "Install filtron in user's ~/go-apps" section
     echo
-    go.install github.com/asciimoo/filtron@latest "${SERVICE_USER}"
+    go.install github.com/searxng/filtron@latest "${SERVICE_USER}"
 }
 
 update_filtron() {
     rst_title "Update filtron" section
     echo
-    go.install github.com/asciimoo/filtron@latest "${SERVICE_USER}"
+    go.install github.com/searxng/filtron@latest "${SERVICE_USER}"
 }
 
 install_rules() {
diff --git a/utils/lib_nvm.sh b/utils/lib_nvm.sh
index d35abef2a..267ba8a4a 100755
--- a/utils/lib_nvm.sh
+++ b/utils/lib_nvm.sh
@@ -94,6 +94,7 @@ nvm.: use nvm (without dot) to execute nvm commands directly
   clean     : remove NVM installation
   status    : prompt some status informations about nvm & node
   nodejs    : install Node.js latest LTS
+  cmd ...   : run command ... in NVM environment
   bash      : start bash interpreter with NVM environment sourced
 EOF
 }
@@ -115,6 +116,8 @@ nvm.install() {
     NVM_VERSION_TAG="$(git describe --abbrev=0 --tags --match "v[0-9]*" "${NVM_VERSION_TAG}")"
     info_msg "checkout ${NVM_VERSION_TAG}"
     git checkout "${NVM_VERSION_TAG}" 2>&1 | prefix_stdout "  ${_Yellow}||${_creset} "
+    popd &> /dev/null
+    cp "${REPO_ROOT}/.nvm_packages" "${NVM_DIR}/default-packages"
     nvm.env
 }
 
@@ -133,7 +136,7 @@ nvm.clean() {
     fi
 }
 
-nvm.status(){
+nvm.status() {
     if command -v node >/dev/null; then
         info_msg "Node.js is installed at $(command -v node)"
         info_msg "Node.js is version $(node --version)"
@@ -153,12 +156,12 @@ nvm.status(){
         info_msg "NVM is installed at ${NVM_DIR}"
     else
         warn_msg "NVM is not installed"
-        info_msg "to install NVM and Node.js (LTS) use: ${main_cmd} nvm install --lts"
+        info_msg "to install NVM and Node.js (LTS) use: ${main_cmd} nvm.nodejs"
     fi
 }
 
-nvm.nodejs(){
-    nvm install --lts
+nvm.nodejs() {
+    nvm install
     nvm.status
 }
 
@@ -167,6 +170,11 @@ nvm.bash() {
     bash --init-file <(cat "${NVM_DIR}/nvm.sh" "${NVM_DIR}/bash_completion")
 }
 
+nvm.cmd() {
+    nvm.ensure
+    "$@"
+}
+
 nvm.ensure() {
     if ! nvm.is_installed; then
         nvm.install
diff --git a/utils/morty.sh b/utils/morty.sh
index c1f2bc968..25263a3d4 100755
--- a/utils/morty.sh
+++ b/utils/morty.sh
@@ -337,7 +337,8 @@ EOF
     echo "export SERVICE_HOME=$SERVICE_HOME"
 
     tee_stderr <<EOF | sudo -i -u "$SERVICE_USER"
-grep -qFs -- 'source $GO_ENV' ~/.profile || echo 'source $GO_ENV' >> ~/.profile
+touch $GO_ENV
+grep -qFs -- 'source "$GO_ENV"' ~/.profile || echo 'source "$GO_ENV"' >> ~/.profile
 EOF
 }