From 39fab2feb0dcb70084421de64cf47095282f0498 Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Sun, 25 Mar 2018 12:47:40 +0200
Subject: [PATCH] cosmetic changes

---
 core_functions.sh |  8 ++++----
 repo_functions.sh |  5 +++--
 yggdrasil.sh      | 33 +++++++++++++++++++++++----------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index ddcd20b..2327ded 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -383,8 +383,8 @@ function addSpecificRepoFct () {
   for i in $AppsRepo; do
     appRepo=(${i//;/ })
     if [ "${appRepo[0]}" == "$1" ]; then
-      printf "[ADD_REPO] for package : $1, "
-      printf "add repo by function : ${appRepo[1]} \n"
+      printf "[ADD] package -- $1 -- repo/ppa "
+      printf "added by function -- ${appRepo[1]} --\n"
       eval "${appRepo[1]}"
       repoAdded=$(($repoAdded+1))
     fi
@@ -404,8 +404,8 @@ function processAppTrtFct () {
   for i in $AppsTrtFct; do
     appTrtFct=(${i//;/ })
     if [ "${appTrtFct[0]}" == "$1" ]; then
-      printf "[TRT_FCT] for package : $1, "
-      printf "processing function : ${appTrtFct[1]} \n"
+      printf "[TRT] package -- $1 -- "
+      printf "post install processed by -- ${appTrtFct[1]} --"
       eval "${appTrtFct[1]}"
     fi
   done
diff --git a/repo_functions.sh b/repo_functions.sh
index c5c34cb..4fe8fcf 100644
--- a/repo_functions.sh
+++ b/repo_functions.sh
@@ -785,8 +785,6 @@ function nitrogen_TrtFct () {
 # install required ppa and settings
 #
 function addRequiredPPA () {
-  msg "Adding PPA and repositories"
-
   runCmd "sudo dpkg --add-architecture i386" \
          "adding i386 architecture"
 
@@ -795,6 +793,9 @@ function addRequiredPPA () {
   runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \
          "apply settings for science-config pkg"
 
+  runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections" \
+         "Accepting Oracle Java SE 9"
+
   addPPA "noobslab/themes" # themes from noobslab
   addPPA "noobslab/icons" # icons from noobslab
   addPPA "numix/ppa" # theme Numix
diff --git a/yggdrasil.sh b/yggdrasil.sh
index bbe29c4..ec0d7a6 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -67,31 +67,37 @@ while getopts ":h,v,f,c,t,u,a,d,k,s,t,n" option; do
        #      tlp, KeyID
        # dev apps : all
        # customization : themes, icons
+      msg "Initializing"
       yggInit
+      msg "Updating the system"
       updateSystem
+      msg "Adding required repo/ppa"
       addRequiredPPA
+      msg "Installing Apps"
       installBase
       installOffice
       installBurningTools
-      installCajaPlugins
-      installNautilusAndPlugins
       installEbook
       installGames
-      installGimpPlugins
       installInternet
       installJava9
       installMiscUtilities
       installMultimedia
       installNetTools
       installOffice
-      installPidginPlugins
-      installRhythmBoxPlugins
       installWine
       installViber
       installFranz
       installTeamViewer13
+      installCajaPlugins
+      installNautilusAndPlugins
+      installGimpPlugins
+      installPidginPlugins
+      installRhythmBoxPlugins
+      msg "Installing HW related"
       installWebcam
       updateMicrocode
+      msg "Applying system customizations"
       enableUFW
       enableNumLockX
       addScreenfetchBashrc
@@ -106,36 +112,43 @@ while getopts ":h,v,f,c,t,u,a,d,k,s,t,n" option; do
        #      tlp, KeyID
        # tweak : /tmp in ram
        #TODO: dev apps
+      msg "Initializing"
       yggInit
+      msg "Updating the system"
       updateSystem
+      msg "Adding required repo/ppa"
       addRequiredPPA
+      msg "Installing Apps"
       installBase
       installOffice
       installBurningTools
-      installCajaPlugins
-      installNautilusAndPlugins
       installEbook
       installGames
-      installGimpPlugins
       installInternet
       installJava9
       installMiscUtilities
       installMultimedia
       installNetTools
       installOffice
-      installPidginPlugins
-      installRhythmBoxPlugins
       installWine
       installViber
       installFranz
       installTeamViewer13
+      installCajaPlugins
+      installNautilusAndPlugins
+      installGimpPlugins
+      installPidginPlugins
+      installRhythmBoxPlugins
+      msg "Installing HW related"
       installWebcam
       updateMicrocode
+      msg "Applying system customizations"
       enableUFW
       enableNumLockX
       addScreenfetchBashrc
       enableHistoryTS
       installUnattendedUpgrades
+      msg "Installing additional themes/icons"
       installIcons
       installThemes
       exit