From 8f3b0f3f22deb1238eca264f074896a3a5aece25 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Wed, 13 Jun 2018 12:18:19 +0200
Subject: [PATCH] npm/gem upd moved to yggInit

---
 core_functions.sh | 35 ++++++++++-------------------------
 vars.sh           |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 713640a..1eafea0 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -170,6 +170,11 @@ function yggInit () {
     installPackage apt "ruby-dev"
   else
     printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
+    printf "[GEM] update --system "
+    printf "\n[GEM] update --system\n" &>> $logFile
+    sudo gem update --system &>> $logFile
+    ret_code=$?
+    retCode $ret_code
   fi
 
   # SNAP
@@ -188,6 +193,11 @@ function yggInit () {
     installPackage apt "nodejs"
   else
     printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
+    printf "[NPM] update npm "
+    printf "\n[NPM] update npm\n" &>> $logFile
+    sudo npm i -g npm &>> $logFile
+    ret_code=$?
+    retCode $ret_code
   fi
 
   # PIP3
@@ -228,7 +238,6 @@ function kernelUpdate () {
 
 #
 # system update
-# input : normal/full
 #TODO: add pip, npm (yarn?), gem
 #
 function updateSystem () {
@@ -260,30 +269,6 @@ function updateSystem () {
     retCode $ret_code
   fi
 
-  if which npm >/dev/null; then
-    printf "[NPM] update npm "
-    printf "\n[NPM] update npm\n" &>> $logFile
-    sudo npm i -g npm &>> $logFile
-    ret_code=$?
-    retCode $ret_code
-  fi
-
-  if which gem >/dev/null; then
-    printf "[GEM] update --system "
-    printf "\n[GEM] update --system\n" &>> $logFile
-    sudo gem update --system &>> $logFile
-    ret_code=$?
-    retCode $ret_code
-
-    if [ "$1" == "full" ]; then
-      printf "[GEM] update gems "
-      printf "\n[GEM] update gems\n" &>> $logFile
-      sudo gem update &>> $logFile
-      ret_code=$?
-      retCode $ret_code
-    fi
-  fi
-
   repoAdded=0
 }
 
diff --git a/vars.sh b/vars.sh
index 49fb7b2..7400788 100644
--- a/vars.sh
+++ b/vars.sh
@@ -13,7 +13,7 @@
 #
 # app version number
 #
-version="0.5.0-b6"
+version="0.5.0-b7"
 
 #
 # myHomedir is used in full paths to the homedir