From f1e894e5878fbd61e9943a9f5fbb9bfa7979ad83 Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Sun, 25 Mar 2018 22:46:40 +0200
Subject: [PATCH] cli opts changes

---
 core_functions.sh    |  2 +-
 install_functions.sh | 17 ++++++++++++++++-
 yggdrasil.sh         |  9 +++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 6f1b4bd..5d85199 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -555,7 +555,7 @@ function usage () {
   printf "\n"
 	printf $NORMAL
 	printf "Usage : yggdrasil [options]\n\n"
-  printf " "$BOLDVERT"-f"$NORMAL" : install everything (see doc for exceptions)\n"
+  printf " "$BOLDVERT"-f"$NORMAL" : install everything (=a+c+w+d+k)\n"
   printf " "$BOLDVERT"-a"$NORMAL" : install all apps\n"
   printf " "$BOLDVERT"-c"$NORMAL" : install gtk themes and icons\n"
   printf " "$BOLDVERT"-w"$NORMAL" : install Nitrogen + remove desktop management from caja\n"
diff --git a/install_functions.sh b/install_functions.sh
index 57ae0a8..05bcfa0 100644
--- a/install_functions.sh
+++ b/install_functions.sh
@@ -159,7 +159,22 @@ function installGamesMenu () {
 }
 
 #
-# Steam (Menu only, due to licence agreement)
+# Steam (headless)
+#
+function installSteam () {
+  runCmd "echo steam	steam/purge	note | sudo debconf-set-selections" \
+        "accepting steam licence"
+
+  runCmd "echo steam	steam/license	note | sudo debconf-set-selections" \
+          "accepting steam licence 2/3"
+
+  runCmd "echo steam	steam/question	select	I AGREE | sudo debconf-set-selections" \
+          "accepting steam licence 3/3"
+  installPackage apt steam
+}
+
+#
+# Steam (Menu)
 #
 function installSteamMenu () {
   runCmd "echo steam	steam/purge	note | sudo debconf-set-selections" \
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 3532439..e4a5466 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -82,6 +82,7 @@ while getopts ":h,v,f,c,u,a,d,k,s,t,n,w,p,T" option; do
       installBurningTools
       installEbook
       installGames
+      installSteam
       installInternet
       installJava9
       installMiscUtilities
@@ -112,8 +113,8 @@ while getopts ":h,v,f,c,u,a,d,k,s,t,n,w,p,T" option; do
       ;;
     f) # full install
        # except
-       # apps : Nitrogen, Beta apps, Nightly, Unboud
-       # hw : solaar, cardreader, fixWirelessIntel6320, nvidia drivers
+       # apps : Beta apps, Nightly
+       # hw : solaar, fixWirelessIntel6320, nvidia drivers
        #      tlp, KeyID
        # tweak : /tmp in ram
        #TODO: dev apps
@@ -129,6 +130,7 @@ while getopts ":h,v,f,c,u,a,d,k,s,t,n,w,p,T" option; do
       installBurningTools
       installEbook
       installGames
+      installSteam
       installInternet
       installJava9
       installMiscUtilities
@@ -144,12 +146,15 @@ while getopts ":h,v,f,c,u,a,d,k,s,t,n,w,p,T" option; do
       msg "Installing HW related"
       installWebcam
       updateMicrocode
+      installCardReader
       msg "Applying system customizations"
       enableUFW
       enableNumLockX
       addScreenfetchBashrc
       enableHistoryTS
       installUnattendedUpgrades
+      installNitrogen
+      enableUnbound
       msg "Installing additional themes/icons"
       installIcons
       installThemes