dosbox added

core_functions.sh

@@ -107,14 +107,6 @@ function isMate () {
 function yggInit () {
   typeset ret_code
 
-  if ! dpkg --print-foreign-architectures | grep -qi i386; then
-    printf "[INIT]"
-    runCmd "sudo dpkg --add-architecture i386" \
-           "adding i386 architecture"
-  else
-    printf "[INIT] i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n"
-  fi
-
   if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ubuntu-make; then
     printf "[INIT][UMAKE] PPA not found, adding PPA...\n"
     printf "[INIT][UMAKE] PPA not found, adding PPA...\n" &>> $logFile
@@ -182,6 +174,7 @@ function yggInit () {
   fi
 }
 
+
 #
 # system update
 #TODO: add pip, npm, gem
@@ -290,9 +283,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 &>> $logFile \
+  && wget -q -O $2 $1 \
-  && sudo dpkg -i $2 &>> $logFile
+  && sudo dpkg -i $2 \
-  sudo apt-get install -fy &>> $logFile
+  && sudo apt-get install -fy &>> $logFile
   ret_code=$?
   retCode $ret_code
 }
@@ -390,8 +383,8 @@ function addSpecificRepoFct () {
   for i in $AppsRepo; do
     appRepo=(${i//;/ })
     if [ "${appRepo[0]}" == "$1" ]; then
-      printf "[ADD] package -- $1 -- repo/ppa "
+      printf "[ADD_REPO] for package : $1, "
-      printf "added by function -- ${appRepo[1]} --\n"
+      printf "add repo by function : ${appRepo[1]} \n"
       eval "${appRepo[1]}"
       repoAdded=$(($repoAdded+1))
     fi
@@ -411,8 +404,8 @@ function processAppTrtFct () {
   for i in $AppsTrtFct; do
     appTrtFct=(${i//;/ })
     if [ "${appTrtFct[0]}" == "$1" ]; then
-      printf "[TRT] package -- $1 -- "
+      printf "[TRT_FCT] for package : $1, "
-      printf "post install processed by -- ${appTrtFct[1]} --"
+      printf "processing function : ${appTrtFct[1]} \n"
       eval "${appTrtFct[1]}"
     fi
   done
@@ -555,17 +548,15 @@ function usage () {
   printf "\n"
 	printf $NORMAL
 	printf "Usage : yggdrasil [options]\n\n"
-  printf " "$BOLDVERT"-f"$NORMAL" : install everything (=a+c+w+d+q)\n"
+  printf " "$BOLDVERT"-f"$NORMAL" : install everything (see doc for exceptions)\n"
   printf " "$BOLDVERT"-a"$NORMAL" : install all apps\n"
-  printf " "$BOLDVERT"-c"$NORMAL" : install Themes and Icons\n"
+  printf " "$BOLDVERT"-c"$NORMAL" : install gtk themes and icons\n"
-  printf " "$BOLDVERT"-w"$NORMAL" : install Nitrogen + remove desktop management from caja\n"
   printf " "$BOLDVERT"-d"$NORMAL" : install DNS Cache Unbound\n"
-  printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\n"
+  printf " "$BOLDVERT"-k"$NORMAL" : install cardreader apps\n"
-  printf " "$BOLDVERT"-s"$NORMAL" : install Solaar for Logitech Unifying devices\n"
+  printf " "$BOLDVERT"-s"$NORMAL" : install Solaar for Logitech devices\n"
   printf " "$BOLDVERT"-t"$NORMAL" : install TLP for Laptops and low energy usage\n"
   printf " "$BOLDVERT"-n"$NORMAL" : install lastest Nvidia graphic drivers\n"
   printf " "$BOLDVERT"-u"$NORMAL" : update system (apt,snap,...)\n"
-  printf " "$BOLDVERT"-p"$NORMAL" : clean useless packages\n"
 	printf " "$BOLDVERT"-v"$NORMAL" : show verison number\n"
   printf " "$BOLDVERT"-h"$NORMAL" : show help & informations\n"
   printf "\n"

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
 }
 
@@ -56,6 +59,7 @@ function installMultimediaMenu () {
 # install eBook Apps (headless)
 #
 function installEbook () {
+  msg "Installing eBook Apps"
   installAppsFromList ebook
 }
 
@@ -70,8 +74,8 @@ function installEbookMenu () {
 # install Internet Apps (headless)
 #
 function installInternet () {
-  runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \
+  msg "Installing Internet Apps"
-         "setting as do not add repo"
+  echo "opera-stable opera-stable/add-deb-source boolean false" | sudo debconf-set-selections
   installAppsFromList internet
 }
 
@@ -79,8 +83,7 @@ function installInternet () {
 # install Internet Apps (Menu)
 #
 function installInternetMenu () {
-  runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \
+  echo "opera-stable opera-stable/add-deb-source boolean false" | sudo debconf-set-selections
-         "setting as do not add repo"
   installAppsFromListMenu internet
 }
 
@@ -96,6 +99,7 @@ function installViber () {
 # Viber (Menu)
 #
 function installViberMenu () {
+  msg "Install Viber"
   installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \
                      viber.deb
 }
@@ -112,6 +116,7 @@ function installFranz () {
 # Franz (Menu)
 #
 function installFranzMenu () {
+  msg "Install Franz"
   installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \
                      franz.deb
 }
@@ -120,6 +125,7 @@ function installFranzMenu () {
 # install Misc Utilities Apps (headless)
 #
 function installMiscUtilities () {
+  msg "Installing utilities Apps"
   installAppsFromList utilities
 }
 
@@ -134,6 +140,7 @@ function installMiscUtilitiesMenu () {
 # install Wine Build (headless)
 #
 function installWine () {
+  msg "Installing Wine Apps"
   installAppsFromList wine
 }
 
@@ -148,6 +155,7 @@ function installWineMenu () {
 # install Game Apps (headless)
 #
 function installGames () {
+  msg "Installing Games apps and tools"
   installAppsFromList games
 }
 
@@ -159,32 +167,9 @@ function installGamesMenu () {
 }
 
 #
-# Steam (headless)
+# Steam (Menu only, due to licence agreement)
-#
-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" \
-        "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
 }
 
@@ -192,7 +177,8 @@ function installSteamMenu () {
 # install Burning Apps (headless)
 #
 function installBurningTools () {
-  installAppsFromList burningtools
+  msg "Installing CD/DVD/BD Burning apps and tools"
+  installAppsFromListMenu burningtools
 }
 
 #
@@ -206,8 +192,7 @@ function installBurningToolsMenu () {
 # install Network Apps (headless)
 #
 function installNetTools () {
-  runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \
+  msg "Installing Network apps and tools"
-         "setting Wireshark as root only"
   installAppsFromList nettools
 }
 
@@ -215,8 +200,6 @@ function installNetTools () {
 # install Network Apps (Menu)
 #
 function installNetToolsMenu () {
-  runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \
-         "setting Wireshark as root only"
   installAppsFromListMenu nettools
 }
 
@@ -224,6 +207,7 @@ function installNetToolsMenu () {
 # install Caja Plugins (headless)
 #
 function installCajaPlugins () {
+  msg "Installing Caja extensions"
   installAppsFromList cajaplugins
 }
 
@@ -238,6 +222,7 @@ function installCajaPluginsMenu () {
 # install Nautilus Apps + plugins (headless)
 #
 function installNautilusAndPlugins () {
+  msg "Installing Nautilus and extensions"
   installAppsFromList nautilus
 }
 
@@ -252,6 +237,7 @@ function installNautilusAndPluginsMenu () {
 # install Gimp plugins (headless)
 #
 function installGimpPlugins () {
+  msg "Installing Gimp extensions"
   installAppsFromList gimp
 }
 
@@ -266,6 +252,7 @@ function installGimpPluginsMenu () {
 # install RhythmBox plugins (headless)
 #
 function installRhythmBoxPlugins () {
+  msg "Installing RhythmBox extensions"
   installAppsFromList rhythmbox
 }
 
@@ -280,6 +267,7 @@ function installRhythmBoxPluginsMenu () {
 # install Pidgin plugins (headless)
 #
 function installPidginPlugins () {
+  msg "Installing Pidgin extensions"
   installAppsFromList pidgin
 }
 
@@ -294,6 +282,7 @@ function installPidginPluginsMenu () {
 # install Nitrogen app (headless)
 #
 function installNitrogen () {
+  msg "Installing Nitrogren"
   installAppsFromList nitrogen
 }
 
@@ -308,6 +297,7 @@ function installNitrogenMenu () {
 # install Beta Apps (headless)
 #
 function installBeta () {
+  msg "Installing Beta Apps"
   installAppsFromList beta
 }
 
@@ -322,6 +312,7 @@ function installBetaMenu () {
 # install Nightly Apps (headless)
 #
 function installNightly () {
+  msg "Installing Nightly Apps"
   installAppsFromList nightly
 }
 
@@ -336,6 +327,7 @@ function installNightlyMenu () {
 # install GTK Themes (headless)
 #
 function installThemes () {
+  msg "Installing themes"
   installAppsFromList gtkthemes
 }
 
@@ -350,6 +342,7 @@ function installThemesMenu () {
 # install Icon Themes (headless)
 #
 function installIcons () {
+  msg "Installing icons"
   installAppsFromList icons
 }
 
@@ -364,6 +357,7 @@ function installIconsMenu () {
 # install Solaar App (headless)
 #
 function installSolaar () {
+  msg "Installing Solaar"
   installAppsFromList solaar
 }
 
@@ -378,6 +372,7 @@ function installSolaarMenu () {
 # install CardReader Apps (headless)
 #
 function installCardReader () {
+  msg "Installing CardReader and utils"
   installAppsFromList cardreader
 }
 
@@ -421,6 +416,7 @@ function fixWirelessIntel6320 () {
 # install Webcam Apps (headless)
 #
 function installWebcam () {
+  msg "Installing Apps needed for Webcams"
   installAppsFromList webcam
 }
 
@@ -435,6 +431,7 @@ function installWebcamMenu () {
 # install Nvidia Drivers (headless)
 #
 function installNvidia370 () {
+  msg "Installing Nvidia 370 driver"
   installAppsFromList nvidia-370
 }
 
@@ -449,6 +446,7 @@ function installNvidia370Menu () {
 # install Nvidia Drivers (headless)
 #
 function installNvidia375 () {
+  msg "Installing Nvidia 375 driver"
   installAppsFromList nvidia-375
 }
 
@@ -463,6 +461,7 @@ function installNvidia375Menu () {
 # install Nvidia Drivers (headless)
 #
 function installNvidia378 () {
+  msg "Installing Nvidia 378 driver"
   installAppsFromList nvidia-378
 }
 
@@ -477,6 +476,7 @@ function installNvidia378Menu () {
 # install Nvidia Drivers (headless)
 #
 function installNvidia381 () {
+  msg "Installing Nvidia 381 driver"
   installAppsFromList nvidia-381
 }
 
@@ -491,6 +491,7 @@ function installNvidia381Menu () {
 # install Nvidia Drivers (headless)
 #
 function installNvidia384 () {
+  msg "Installing Nvidia 384 driver"
   installAppsFromList nvidia-384
 }
 
@@ -501,38 +502,11 @@ function installNvidia384Menu () {
   installAppsFromListMenu nvidia-384
 }
 
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia387 () {
-  installAppsFromList nvidia-387
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia387Menu () {
-  installAppsFromListMenu nvidia-387
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia390 () {
-  installAppsFromList nvidia-390
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia390Menu () {
-  installAppsFromListMenu nvidia-390
-}
-
 #
 # install TLP App (headless)
 #
 function installTLP () {
+  msg "Installing TLP"
   installAppsFromList tlp
 }
 
@@ -545,6 +519,7 @@ function installTLPMenu () {
 
 #TODO:
 function installKeyIDuDev () {
+  msg "Adding UDEV rules"
   sudo sh -c "echo '# this udev file should be used with udev 188 and newer\n\
 ACTION!=\"add|change\", GOTO=\"u2f_end\"\n\
 \n\
@@ -561,6 +536,7 @@ LABEL=\"u2f_end\"' > /etc/udev/rules.d/70-u2f.rules"
 # install Dev Apps (headless)
 #
 function installDevApps () {
+  msg "Installing base Dev apps and tools"
   installAppsFromList dev
 }
 
@@ -576,6 +552,7 @@ function installDevAppsMenu () {
 # install Javascript env (headless)
 #
 function installJavascript () {
+  msg "Installing Javascript env"
   installAppsFromList javascript
 }
 
@@ -590,8 +567,7 @@ function installJavascriptMenu () {
 # install JAVA 9 (headless)
 #
 function installJava9 () {
-  runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
+  msg "Installing Java9 + set as Default"
-         "accepting Oracle Java SE 9 licence agreement"
   installAppsFromList java9
 }
 
@@ -599,8 +575,6 @@ function installJava9 () {
 # install JAVA 9 (Menu)
 #
 function installJava9Menu () {
-  runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
-         "accepting Oracle Java SE 9 licence agreement"
   installAppsFromListMenu java9
 }
 
@@ -608,6 +582,7 @@ function installJava9Menu () {
 # install Mongo DB 3 CE (headless)
 #
 function installMongo3CE () {
+  msg "Installing Mongo DB 3 CE Apps"
   installAppsFromList mongodb-org
 }
 
@@ -622,6 +597,7 @@ function installMongo3CEMenu () {
 # install Python Apps (headless)
 #
 function installPython () {
+  msg "Installing Python apps and tools"
   installAppsFromList python
 }
 
@@ -636,6 +612,7 @@ function installPythonMenu () {
 # install PHP Apps (headless)
 #
 function installPHP () {
+  msg "Installing PHP apps and tools"
   installAppsFromList php
 }
 
@@ -650,6 +627,7 @@ function installPHPMenu () {
 # install QT Apps/tools (headless)
 #
 function installQT () {
+  msg "Installing QT apps and tools"
   installAppsFromList qt
 }
 
@@ -664,6 +642,7 @@ function installQTMenu () {
 # install LUA Apps (headless)
 #
 function installLUA () {
+  msg "Installing LUA apps and tools"
   installAppsFromList lua
 }
 
@@ -678,6 +657,7 @@ function installLUAMenu () {
 # install Ruby Apps (headless)
 #
 function installRuby () {
+  msg "Installing Ruby apps and tools"
   installAppsFromList ruby
 }
 
@@ -751,6 +731,7 @@ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir
 # install Atom App (headless)
 #
 function installAtom () {
+  msg "Installing Atom and extensions"
   installAppsFromList atom
 }
 
@@ -758,6 +739,7 @@ function installAtom () {
 # install Atom App (menu)
 #
 function installAtomMenu () {
+  msg "Installing Atom and extensions"
   installAppsFromListMenu atom
 }
 
@@ -765,6 +747,7 @@ function installAtomMenu () {
 # install Anjuta Apps (headless)
 #
 function installAnjuta () {
+  msg "Installing Anjuta"
   installAppsFromList anjuta
 }
 
@@ -779,6 +762,7 @@ function installAnjutaMenu () {
 # install Brackets Apps (headless)
 #
 function installBrackets () {
+  msg "Installing Brackets"
   installAppsFromList brackets
 }
 
@@ -793,6 +777,7 @@ function installBracketsMenu () {
 # install CodeBlocks Apps (headless)
 #
 function installCodeBlocks () {
+  msg "Installing CodeBlocks"
   installAppsFromList codeblocks
 }
 
@@ -807,6 +792,7 @@ function installCodeBlocksMenu () {
 # install Geany Apps (headless)
 #
 function installGeany () {
+  msg "Installing Geany and extensions"
   installAppsFromList geany
 }
 
@@ -829,6 +815,7 @@ function installEclipse () {
 # install IDEA Apps (headless)
 #
 function installIdea () {
+  msg "Installing Intellij-IDEA"
   installAppsFromList idea
 }
 
@@ -843,6 +830,7 @@ function installIdeaMenu () {
 # install Pycharm Apps (headless)
 #
 function installPyCharm () {
+  msg "Installing PyCharm"
   installAppsFromList pycharm
 }
 
@@ -857,6 +845,7 @@ function installPyCharmMenu () {
 # install Visual Studio Code Apps (headless)
 #
 function installVisualStudioCode () {
+  msg "Installing Visual Studio Code"
   installAppsFromList code
 }
 
@@ -871,6 +860,7 @@ function installVisualStudioCodeMenu () {
 # install Android-Studio Apps (headless)
 #
 function installAndroidStudio () {
+  msg "Installing Android-Studio"
   installAppsFromList androidstudio
 }
 
@@ -885,6 +875,7 @@ function installAndroidStudioMenu () {
 # install SublimeText Apps (headless)
 #
 function installSublimeText() {
+  msg "Installing Sublime-Text"
   installAppsFromList sublime-text
 }
 
@@ -899,6 +890,7 @@ function installSublimeTextMenu() {
 # install CAD Apps (headless)
 #
 function installCAD () {
+  msg "Installing CAD apps and tools"
   installAppsFromList cad
 }
 
@@ -913,6 +905,7 @@ function installCADMenu () {
 # install Teamviewer 13 (headless)
 #
 function installTeamViewer13 () {
+  msg "Install Teamviewer 13"
   installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \
                      teamviewer13.deb
 }
@@ -929,6 +922,7 @@ function installTeamViewer13Menu () {
 # install/enable Unboud (headless)
 #
 function enableUnbound () {
+  msg "Installing Unbound"
   installAppsFromList unbound
 }
 

menus_functions.sh

@@ -411,8 +411,6 @@ function showHardwareMenu () {
     "nvidia378" "Install Nvidia 378 graphic drivers" \
     "nvidia381" "Install Nvidia 381 graphic drivers" \
     "nvidia384" "Install Nvidia 384 graphic drivers" \
-    "nvidia387" "Install Nvidia 387 graphic drivers" \
-    "nvidia390" "Install Nvidia 390 graphic drivers" \
     "tlp" "Install/Enable TLP for better power management " \
     "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \
     "WI6320" "Fix Intel Wireless 6320 card config problem" \
@@ -446,12 +444,6 @@ function showHardwareMenu () {
       "nvidia384")
         installNvidia384Menu
         ;;
-      "nvidia387")
-        installNvidia387Menu
-        ;;
-      "nvidia390")
-        installNvidia390Menu
-        ;;
       "tlp")
         installTLPMenu
         ;;

repo_functions.sh

@@ -101,7 +101,6 @@ quodlibet;apt;multimedia;quodlibet
 python-cddb;apt;multimedia;python-cddb
 python-musicbrainz2;apt;multimedia;python-musicbrainz2
 gmusicbrowser;apt;multimedia;gmusicbrowser
-peek;apt;multimedia;peek
 owncloud-client;apt;internet;owncloud-client
 syncthing-gtk;apt;internet;syncthing-gtk
 syncthing;apt;internet;syncthing
@@ -333,14 +332,6 @@ nvidia-384;apt;nvidia-384;nvidia-384
 nvidia-settings;apt;nvidia-384;nvidia-settings
 nvidia-opencl-icd-384;apt;nvidia-384;nvidia-opencl-icd-384
 libcuda1-384;apt;nvidia-384;libcuda1-384
-nvidia-387;apt;nvidia-387;nvidia-387
-nvidia-settings;apt;nvidia-387;nvidia-settings
-nvidia-opencl-icd-387;apt;nvidia-387;nvidia-opencl-icd-387
-libcuda1-387;apt;nvidia-387;libcuda1-387
-nvidia-390;apt;nvidia-390;nvidia-390
-nvidia-settings;apt;nvidia-390;nvidia-settings
-nvidia-opencl-icd-390;apt;nvidia-390;nvidia-opencl-icd-390
-libcuda1-390;apt;nvidia-390;libcuda1-390
 tlp;apt;tlp;tlp
 notepadqq;apt;dev;notepadqq
 agave;apt;dev;agave
@@ -366,7 +357,6 @@ jedi;npm;dev;jedi
 beautysh;pip;dev;beautysh
 retext;pip;dev;retext
 mycli;pip;dev;mycli
-sqlitebrowser;apt;dev;sqlitebrowser
 npm;apt;javascript;npm
 nodejs;apt;javascript;nodejs8lts
 javascript-common;apt;javascript;javascript-common
@@ -388,7 +378,7 @@ codeblocks-contrib;apt;codeblocks;codeblocks-contrib
 geany;apt;geany;geany
 geany-plugins;apt;geany;geany-plugins
 geany-plugin-markdown;apt;geany;geany-plugin-markdown
-pycharm-community;snap;pycharm-community;pycharm-community
+pycharm;apt;pycharm;pycharm
 sublime-text;apt;sublime-text;sublime-text
 kicad;apt;cad;kicad
 kicad-locale-fr;apt;cad;kicad-locale-fr
@@ -459,23 +449,7 @@ kicad;addRepo_Kicad
 nodejs8lts;addRepo_NodeLts8
 telegram;addRepo_Telegram
 skypeforlinux;addRepo_SkypeForLinux
-shotwell;addRepo_Shotwell
+shotwell;addRepo_Shotwell"
-peek;addRepo_Peek
-sqlitebrowser;addRepo_SQLiteBrowser"
-
-#
-# SQLiteBrowser
-#
-function addRepo_SQLiteBrowser () {
-  addPPA "ppa:linuxgndu/sqlitebrowser"
-}
-
-#
-# Peek
-#
-function addRepo_Peek () {
-  addPPA "ppa:peek-developers/stable"
-}
 
 #
 # Shotwell
@@ -675,8 +649,7 @@ function addRepo_MongoDB3CE () {
 #
 function addRepo_Wine () {
   addKey "https://dl.winehq.org/wine-builds/Release.key"
-  addRepo "winehq.list" \
+  addPPA "https://dl.winehq.org/wine-builds/ubuntu/"
-          "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main"
 }
 
 #
@@ -812,6 +785,13 @@ function nitrogen_TrtFct () {
 # install required ppa and settings
 #
 function addRequiredPPA () {
+  msg "Adding PPA and repositories"
+
+  runCmd "sudo dpkg --add-architecture i386" \
+         "adding i386 architecture"
+
+  installPackage apt "apt-transport-https"
+
   runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \
          "apply settings for science-config pkg"
 
@@ -825,8 +805,8 @@ function addRequiredPPA () {
   addPPA "videolan/stable-daily" # video player
   addPPA "nowrep/qupzilla" # web browser
   addPPA "atareao/atareao" # pushbullet-indicator, imagedownloader, gqrcode, cpu-g
-  addPPA "fossfreedom/rhythmbox" # Rhythmbox
   addPPA "fossfreedom/rhythmbox-plugins";  # Rhythmbox plugins
+  addPPA "fossfreedom/rhythmbox" # Rhythmbox
   addPPA "nilarimogard/webupd8" # Audacious, Grive2, Pidgin-indicator
   addPPA "oibaf/graphics-drivers" # free graphics-drivers + mesa
   addPPA "team-xbmc/ppa" # Kodi

yggdrasil.sh

@@ -49,18 +49,15 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
 
 #
 # arguments/options management with getopts
-
+#
-while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,T" option; do
+while getopts ":h,v,f,c,t,u,a,d,k,s,t,n" option; do
   case "$option" in
-    T) #test purpose only
+    t) #test purpose only
-      yggInit
+      #yggInit
       #installIdea
       #installNetTools
       #installOffice
       #addPPA "tmsu/ppa"
-      updateSystem
-      addRequiredPPA
-      installTeamViewer13
       exit
       ;;
     a) # install all apps
@@ -70,99 +67,77 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,T" 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
-      installSteam
+      installGimpPlugins
       installInternet
       installJava9
       installMiscUtilities
       installMultimedia
       installNetTools
       installOffice
-      installWine
-      installCajaPlugins
-      installNautilusAndPlugins
-      installGimpPlugins
       installPidginPlugins
       installRhythmBoxPlugins
-      msg "Installing HW related"
+      installWine
+      installViber
+      installFranz
+      installTeamViewer13
       installWebcam
       updateMicrocode
-      msg "Applying system customizations"
       enableUFW
       enableNumLockX
       addScreenfetchBashrc
       enableHistoryTS
       installUnattendedUpgrades
-      msg "Installing external apps"
-      installViber
-      installFranz
-      installTeamViewer13
-      toolAutoremove
       exit
       ;;
     f) # full install
        # except
-       # apps : Beta apps, Nightly
+       # apps : Nitrogen, Beta apps, Nightly, Unboud
-       # hw : solaar, fixWirelessIntel6320, nvidia drivers
+       # hw : solaar, cardreader, fixWirelessIntel6320, nvidia drivers
        #      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
-      installSteam
+      installGimpPlugins
       installInternet
       installJava9
       installMiscUtilities
       installMultimedia
       installNetTools
       installOffice
-      installWine
-      installCajaPlugins
-      installNautilusAndPlugins
-      installGimpPlugins
       installPidginPlugins
       installRhythmBoxPlugins
-      msg "Installing HW related"
+      installWine
+      installViber
+      installFranz
+      installTeamViewer13
       installWebcam
       updateMicrocode
-      installCardReader
-      msg "Applying system customizations"
       enableUFW
       enableNumLockX
       addScreenfetchBashrc
       enableHistoryTS
       installUnattendedUpgrades
-      installNitrogen
-      enableUnbound
-      msg "Installing additional themes/icons"
       installIcons
       installThemes
-      msg "Installing external apps"
-      installViber
-      installFranz
-      installTeamViewer13
-      toolAutoremove
       exit
       ;;
     c) # install themes and icons
@@ -173,19 +148,13 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,T" option; do
       installThemes
       exit
       ;;
-    w) # nitrogen
-      yggInit
-      updateSystem
-      installNitrogen
-      exit
-      ;;
     d) # install Unbound DNS Cache
       yggInit
       updateSystem
       enableUnbound
       exit
       ;;
-    q) # cardreader
+    k) # cardreader
       yggInit
       updateSystem
       installCardReader
@@ -206,7 +175,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,T" option; do
     n) # latest nvidia driver (see menus if need older version)
       yggInit
       updateSystem
-      installNvidia390
+      installNvidia384
       exit
       ;;
     u)
@@ -214,10 +183,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,T" option; do
       updateSystem
       exit
       ;;
-    p)
-      toolAutoremove
-      exit
-      ;;
     h) # display help
       usage
       exit