From 8733d5bb186cae591c5369ed0f2f36ed1e2ee3a7 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Wed, 10 Jul 2019 22:50:00 +0200
Subject: [PATCH] HWE added

---
 core_functions.sh         |  1 +
 menus_functions_ub1804.sh |  4 ++++
 repo_functions_ub1804.sh  |  6 +++++-
 yggdrasil.sh              | 13 ++++++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 9c9eb60..bbde3c0 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -631,6 +631,7 @@ function usage () {
   printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\n"
   printf " "$BOLDVERT"-s"$NORMAL" : install Solaar for Logitech Unifying devices\n"
   printf " "$BOLDVERT"-t"$NORMAL" : install TLP for Laptops and low energy usage\n"
+  printf " "$BOLDVERT"-k"$NORMAL" : install HWE (Ubuntu's Hardware Enablement Stack)(newer kernel+xorg)\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"
diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index 4115a81..0bcfcac 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -441,6 +441,7 @@ function showHardwareMenu () {
     --title "Yggdrasil $version - System Tools" \
     --menu "System tools to diagnose and optimize" \
     25 80 16 \
+    "HWE" "Ubuntu Hardware Enablement Stack (newer kernel+xorg)" \
     "cardreader" "Apps/tools needed for cardreaders" \
     "solaar" "Solaar for Logitech Unifying devices" \
     "webcam" "Install webcam neede apps" \
@@ -451,6 +452,9 @@ function showHardwareMenu () {
     "Back" "Back"  3>&1 1>&2 2>&3)
 
     case $hardwareMenuOptions in
+      "HWE")
+        installAppsFromListMenu hwe
+        ;;
       "cardreader")
         installAppsFromListMenu cardreader
         ;;
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 99151c7..95bb596 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -392,7 +392,11 @@ calibre;apt;ebook;calibre
 android-studio;apt;androidstudio;androidstudio
 intellij-idea-community;snap;idea;idea
 eclipse;snap;eclipse;eclipse
-gitkraken;snap;gitkraken;gitkraken"
+gitkraken;snap;gitkraken;gitkraken
+xserver-xorg-hwe-18.04;apt;hwe;xserver-xorg-hwe-18.04
+xserver-xorg-video-all-hwe-18.04;apt;hwe;xserver-xorg-video-all-hwe-18.04
+linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04
+linux-hwe-tools;apt;hwe;linux-hwe-tools"
 
 #-----------------------------------------------------------------------------#
 # Specific Repo list and functions                                            #
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 9b64216..a873ac2 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -62,7 +62,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
 #
 # arguments/options management with getopts
 
-while getopts ":h,v,f,c,u,a,d,q,s,t,w,p" option; do
+while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do
   case "$option" in
     a) # install all apps
       if [ $ygginitCount = false ]; then
@@ -222,6 +222,17 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,p" option; do
       msg "Installing TLP"
       installAppsFromList tlp
       ;;
+    k) # Ubuntu Hardware Enablement Stack
+      if [ $ygginitCount = false ]; then
+        msg "Initializing"
+        yggInit
+        msg "Updating the system"
+        updateSystem
+        ygginitCount=true
+      fi
+      msg "Installing HWE (newer kernel+xorg)"
+      installAppsFromList hwe
+      ;;
     u)
       msg "Initializing"
       yggInit