From 3c73877d539b0f8cde8c721fec1c1bde865a4be1 Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Sun, 27 May 2018 01:07:39 +0200
Subject: [PATCH] nvidia drivers fix

---
 install_functions_ub1804.sh | 60 ++-----------------------------------
 menus_functions_ub1804.sh   | 16 ----------
 repo_functions_ub1804.sh    | 22 +++-----------
 3 files changed, 6 insertions(+), 92 deletions(-)

diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh
index c2ed85a..8a89169 100644
--- a/install_functions_ub1804.sh
+++ b/install_functions_ub1804.sh
@@ -446,62 +446,6 @@ function installOibafMenu () {
   addRepo_Oibaf
 }
 
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia370 () {
-  installAppsFromList nvidia-370
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia370Menu () {
-  installAppsFromListMenu nvidia-370
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia375 () {
-  installAppsFromList nvidia-375
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia375Menu () {
-  installAppsFromListMenu nvidia-375
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia378 () {
-  installAppsFromList nvidia-378
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia378Menu () {
-  installAppsFromListMenu nvidia-378
-}
-
-#
-# install Nvidia Drivers (headless)
-#
-function installNvidia381 () {
-  installAppsFromList nvidia-381
-}
-
-#
-# install Nvidia Drivers (Menu)
-#
-function installNvidia381Menu () {
-  installAppsFromListMenu nvidia-381
-}
-
 #
 # install Nvidia Drivers (headless)
 #
@@ -548,14 +492,14 @@ function installNvidia390Menu () {
 # install Nvidia Drivers (headless)
 #
 function installNvidia396 () {
-  installAppsFromList nvidia-396
+  installAppsFromList nvidia-driver-396
 }
 
 #
 # install Nvidia Drivers (Menu)
 #
 function installNvidia396Menu () {
-  installAppsFromListMenu nvidia-396
+  installAppsFromListMenu nvidia-driver-396
 }
 
 #
diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index b898a6a..1bb5305 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -410,10 +410,6 @@ function showHardwareMenu () {
     "webcam" "Install webcam neede apps" \
     "microcode" "Update Intel/AMD CPU microcode" \
     "oibaf" "latest version of free graphic drivers, mesa, ..." \
-    "nvidia370" "Install Nvidia 370 graphic drivers" \
-    "nvidia375" "Install Nvidia 375 graphic drivers" \
-    "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" \
@@ -439,18 +435,6 @@ function showHardwareMenu () {
       "oibaf")
         installOibafMenu
         ;;
-      "nvidia370")
-        installNvidia370Menu
-        ;;
-      "nvidia375")
-        installNvidia375Menu
-        ;;
-      "nvidia378")
-        installNvidia378Menu
-        ;;
-      "nvidia381")
-        installNvidia381Menu
-        ;;
       "nvidia384")
         installNvidia384Menu
         ;;
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index a6aa750..1201b87 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -322,20 +322,6 @@ pcsc-tools;apt;cardreader;pcsc-tools
 libacr38u;apt;cardreader;libacr38u
 guvcview;apt;webcam;guvcview
 cheese;apt;webcam;cheese
-nvidia-370;apt;nvidia-370;nvidia-370
-nvidia-settings;apt;nvidia-370;nvidia-settings
-nvidia-opencl-icd-370;apt;nvidia-370;nvidia-opencl-icd-370
-nvidia-375;apt;nvidia-375;nvidia-375
-nvidia-settings;apt;nvidia-375;nvidia-settings
-nvidia-opencl-icd-375;apt;nvidia-375;nvidia-opencl-icd-375
-nvidia-378;apt;nvidia-378;nvidia-378
-nvidia-settings;apt;nvidia-378;nvidia-settings
-nvidia-opencl-icd-378;apt;nvidia-378;nvidia-opencl-icd-378
-libcuda1-378;apt;nvidia-378;libcuda1-378
-nvidia-381;apt;nvidia-381;nvidia-381
-nvidia-settings;apt;nvidia-381;nvidia-settings
-nvidia-opencl-icd-381;apt;nvidia-381;nvidia-opencl-icd-381
-libcuda1-381;apt;nvidia-381;libcuda1-381
 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
@@ -347,11 +333,11 @@ 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
+nvidia-utils-390;apt;nvidia-390;nvidia-utils-390
 libcuda1-390;apt;nvidia-390;libcuda1-390
-nvidia-396;apt;nvidia-396;nvidia-396
-nvidia-settings;apt;nvidia-396;nvidia-settings
-nvidia-opencl-icd-396;apt;nvidia-396;nvidia-opencl-icd-396
-libcuda1-396;apt;nvidia-396;libcuda1-396
+nvidia-driver-396;apt;nvidia-driver-396;nvidia-driver-396
+nvidia-settings;apt;nvidia-driver-396;nvidia-settings
+nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396
 tlp;apt;tlp;tlp
 notepadqq;apt;dev;notepadqq
 agave;apt;dev;agave