From 92c52d9d41edd4b719cf0b7c36bf32c91b51364d Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Sat, 4 Jul 2020 19:53:00 +0200
Subject: [PATCH] add screenfetch to .bashrc as PostTrtFct

---
 menus_functions_ub1804.sh |  5 -----
 menus_functions_ub2004.sh |  5 -----
 repo_functions_ub1804.sh  | 13 ++++++++++++-
 repo_functions_ub2004.sh  | 13 ++++++++++++-
 tools_functions.sh        | 11 -----------
 yggdrasil.sh              |  2 --
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index 0fe51c3..ac74287 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -69,11 +69,6 @@ function showConfigMenu () {
         enableTmpRAM
         pressKey
         ;;
-      "screenfetch")
-        clear
-        addScreenfetchBashrc
-        pressKey
-        ;;
       "historyTS")
         clear
         enableHistoryTS
diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh
index 251103a..4c81581 100644
--- a/menus_functions_ub2004.sh
+++ b/menus_functions_ub2004.sh
@@ -69,11 +69,6 @@ function showConfigMenu () {
         enableTmpRAM
         pressKey
         ;;
-      "screenfetch")
-        clear
-        addScreenfetchBashrc
-        pressKey
-        ;;
       "historyTS")
         clear
         enableHistoryTS
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 0926c32..6aeec8e 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -1144,7 +1144,18 @@ gcc8;gcc8_PostTrtFct
 ruby-dev;ruby-dev_PostTrtFct
 virtualbox-6.1;virtualbox-6.1_PostTrtFct
 gufw;gufw_PostTrtFct
-numlockx;numlockx_PostTrtFct"
+numlockx;numlockx_PostTrtFct
+screenfetch;screenfetch_PostTrtFct"
+
+#
+# screenfetch in .bashrc
+#
+function screenfetch_PostTrtFct () {
+  runCmd "touch /home/$myHomedir/.bashrc" \
+         "creating .bashrc file if necessary"
+  runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \
+         "adding screenfetch to .bashrc"
+}
 
 #
 # numlockx
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index dceed51..f7a54c4 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -1024,7 +1024,18 @@ flatpak;flatpak_PostTrtFct
 ruby-dev;ruby-dev_PostTrtFct
 virtualbox;virtualbox_PostTrtFct
 gufw;gufw_PostTrtFct
-numlockx;numlockx_PostTrtFct"
+numlockx;numlockx_PostTrtFct
+screenfetch;screenfetch_PostTrtFct"
+
+#
+# screenfetch in .bashrc
+#
+function screenfetch_PostTrtFct () {
+  runCmd "touch /home/$myHomedir/.bashrc" \
+         "creating .bashrc file if necessary"
+  runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \
+         "adding screenfetch to .bashrc"
+}
 
 #
 # numlockx
diff --git a/tools_functions.sh b/tools_functions.sh
index aebf159..90ad8f5 100644
--- a/tools_functions.sh
+++ b/tools_functions.sh
@@ -21,17 +21,6 @@ function enableTmpRAM () {
   fi
 }
 
-#
-# add screenfetch exec in .bashrc
-#
-function addScreenfetchBashrc () {
-  checkAndInstallDep apt screenfetch screenfetch
-  runCmd "touch /home/$myHomedir/.bashrc" \
-         "creating .bashrc file if necessary"
-  runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \
-         "adding screenfetch to .bashrc"
-}
-
 #
 # cli history cmd timestamp enable
 #
diff --git a/yggdrasil.sh b/yggdrasil.sh
index f3bab4a..a56e6fa 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -100,7 +100,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do
       installAppsFromList webcam
       updateMicrocode
       msg "Applying system customizations"
-      addScreenfetchBashrc
       enableHistoryTS
       msg "Installing external apps"
       installViber
@@ -141,7 +140,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do
       updateMicrocode
       installAppsFromList cardreader
       msg "Applying system customizations"
-      addScreenfetchBashrc
       enableHistoryTS
       installAppsFromList unbound
       msg "Installing additional themes/icons"