From d30c4479303a6ad4e7b671acb6e5b827560d8136 Mon Sep 17 00:00:00 2001
From: shakasan <shakasan@sirenacorp.be>
Date: Fri, 5 Jan 2018 07:14:58 +0100
Subject: [PATCH] misc modif

---
 core_functions.sh    |  2 +-
 install_functions.sh | 27 +++++++++++++++++++++------
 repo_functions.sh    |  3 ++-
 yggdrasil.sh         |  5 +++--
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 6546efa..81d94ea 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -661,7 +661,7 @@ function usage () {
   dispLogo
 	printf "$NORMAL"
 	printf "Usage : yggdrasil [options]\n"
-  printf "  -a : install all apps (see doc for more details\n"
+  printf "  -f : full install (see doc for more details)\n"
   printf "  -c : install gtk themes and icons\n"
   printf "  -u : update system (apt,snap,...)\n"
 	printf "  -v : show verison number\n"
diff --git a/install_functions.sh b/install_functions.sh
index 706be45..e4dbef2 100644
--- a/install_functions.sh
+++ b/install_functions.sh
@@ -14,6 +14,7 @@
 # install Base Apps (headless)
 #
 function installBase () {
+  msg "Installing Base Apps"
   installAppsFromList base
 }
 
@@ -28,6 +29,7 @@ function installBaseMenu () {
 # install Office Apps (headless)
 #
 function installOffice () {
+  msg "Installing Office Apps"
   installAppsFromList office
 }
 
@@ -42,6 +44,7 @@ function installOfficeMenu () {
 # install Multimedia Apps (headless)
 #
 function installMultimedia () {
+  msg "Installing Multimedia Apps"
   installAppsFromList multimedia
 }
 
@@ -80,19 +83,30 @@ function installMultimediaExt () {
   sudo apt-get install -fy
 }
 
-#TODO:
+#
+# install eBook Apps (headless)
+#
 function installEbook () {
-  msg "Installation eBook apps and tools"
-  runCmd "sudo apt-get install -y fbreader"; smsgn "Installing fbreader"
-  cd /tmp
-  runCmd "sudo -v && wget -q --no-check-certificate -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c \"import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()\""
-  smsgn "Installing calibre"
+  msg "Installing eBook Apps"
+  installAppsFromList ebook
+  #TODO:
+  # cd /tmp
+  # runCmd "sudo -v && wget -q --no-check-certificate -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c \"import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()\""
+  # smsgn "Installing calibre"
+}
+
+#
+# install eBook Apps (Menu)
+#
+function installEbookMenu () {
+  installAppsFromListMenu ebook
 }
 
 #
 # install Internet Apps (headless)
 #
 function installInternet () {
+  msg "Installing Internet Apps"
   echo "opera-stable opera-stable/add-deb-source boolean false" | sudo debconf-set-selections
   installAppsFromList internet
 }
@@ -157,6 +171,7 @@ function installInternetExt () {
 # install Misc Utilities Apps (headless)
 #
 function installMiscUtilities () {
+  msg "Installing utilities Apps"
   installAppsFromList utilities
 }
 
diff --git a/repo_functions.sh b/repo_functions.sh
index 73717e6..c3524bb 100644
--- a/repo_functions.sh
+++ b/repo_functions.sh
@@ -399,7 +399,8 @@ qt5-doc;apt;qt;qt5-doc
 qttools5-doc;apt;qt;qttools5-doc
 qttools5-dev-tools;apt;qt;qttools5-dev-tools
 qttools5-examples;apt;qt;qttools5-examples
-qttools5-doc-html;apt;qt;qttools5-doc-html"
+qttools5-doc-html;apt;qt;qttools5-doc-html
+fbreader;apt;ebook;fbreader"
 
 #-----------------------------------------------------------------------------#
 # Specific Repo list and functions                                            #
diff --git a/yggdrasil.sh b/yggdrasil.sh
index eaa6d2f..877635f 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -38,7 +38,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
 #
 # arguments/options management with getopts
 #
-while getopts ":h,v,a,c,t,u" option; do
+while getopts ":h,v,f,c,t,u" option; do
   case "$option" in
     t) #test purpose only
       installNightly
@@ -46,8 +46,9 @@ while getopts ":h,v,a,c,t,u" option; do
       installBase
       exit
       ;;
-    a) # install all apps
+    f) # install all apps
       #TODO:
+      addRequiredPPA
       msg "Installing all Apps"
       installBase
       installBurningTools