From 7136001efff98d070c94bac0e7de1740d0ac2a13 Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Sun, 25 Mar 2018 22:00:32 +0200
Subject: [PATCH] wine repo add fixed + fct installPackageDpkg fixed (dep) + 
 ..

---
 core_functions.sh    |  7 +++----
 install_functions.sh |  8 ++++++++
 repo_functions.sh    |  3 ++-
 yggdrasil.sh         | 11 +++++++----
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 7fe7fda..7421942 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -182,7 +182,6 @@ function yggInit () {
   fi
 }
 
-
 #
 # system update
 #TODO: add pip, npm, gem
@@ -291,9 +290,9 @@ function installPackageDpkg () {
   printf "[PKG] Installing $2 from $1 "
   printf "\n[PKG] installing $2 from $1\n" &>> $logFile
   cd /tmp \
-  && wget -q -O $2 $1 \
-  && sudo dpkg -i $2 \
-  && sudo apt-get install -fy &>> $logFile
+  && wget -q -O $2 $1 &>> $logFile \
+  && sudo dpkg -i $2 &>> $logFile
+  sudo apt-get install -fy &>> $logFile
   ret_code=$?
   retCode $ret_code
 }
diff --git a/install_functions.sh b/install_functions.sh
index 172f433..ab55bc5 100644
--- a/install_functions.sh
+++ b/install_functions.sh
@@ -162,6 +162,14 @@ function installGamesMenu () {
 # Steam (Menu only, due to licence agreement)
 #
 function installSteamMenu () {
+  rundCmd "echo steam	steam/purge	note | sudo debconf-set-selections" \
+        "accepting steam licence"
+
+  rundCmd "echo steam	steam/license	note | sudo debconf-set-selections" \
+          "accepting steam licence 2/3"
+
+  rundCmd "echo steam	steam/question	select	I AGREE | sudo debconf-set-selections" \
+          "accepting steam licence 3/3"
   installPackage apt steam
 }
 
diff --git a/repo_functions.sh b/repo_functions.sh
index 1fea064..1c30f62 100644
--- a/repo_functions.sh
+++ b/repo_functions.sh
@@ -649,7 +649,8 @@ function addRepo_MongoDB3CE () {
 #
 function addRepo_Wine () {
   addKey "https://dl.winehq.org/wine-builds/Release.key"
-  addPPA "https://dl.winehq.org/wine-builds/ubuntu/"
+  addRepo "winehq.list" \
+          "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main"
 }
 
 #
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 4a2cd89..97faf3f 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -49,15 +49,18 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
 
 #
 # arguments/options management with getopts
-#
-while getopts ":h,v,f,c,t,u,a,d,k,s,t,n" option; do
+
+while getopts ":h,v,f,c,u,a,d,k,s,t,n,T" option; do
   case "$option" in
-    t) #test purpose only
-      #yggInit
+    T) #test purpose only
+      yggInit
       #installIdea
       #installNetTools
       #installOffice
       #addPPA "tmsu/ppa"
+      updateSystem
+      addRequiredPPA
+      installTeamViewer13
       exit
       ;;
     a) # install all apps