From dc613d80f21c90fa8ee9c1f70236454f1d62fa8f Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Fri, 4 May 2018 00:20:39 +0200
Subject: [PATCH] Oracle JAVA 8/9 replaced by 10

---
 install_functions.sh | 20 ++++++++++----------
 menus_functions.sh   |  6 +++---
 repo_functions.sh    | 14 +++++++-------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/install_functions.sh b/install_functions.sh
index 652588d..1022b6a 100644
--- a/install_functions.sh
+++ b/install_functions.sh
@@ -615,21 +615,21 @@ function installJavascriptMenu () {
 }
 
 #
-# install JAVA 9 (headless)
+# install JAVA 10 (headless)
 #
-function installJava9 () {
-  runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
-         "accepting Oracle Java SE 9 licence agreement"
-  installAppsFromList java9
+function installJava10 () {
+  runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
+         "accepting Oracle Java SE 10 licence agreement"
+  installAppsFromList java10
 }
 
 #
-# install JAVA 9 (Menu)
+# install JAVA 10 (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
+function installJava10Menu () {
+  runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
+         "accepting Oracle Java SE 10 licence agreement"
+  installAppsFromListMenu java10
 }
 
 #
diff --git a/menus_functions.sh b/menus_functions.sh
index fa5967d..5e88e49 100644
--- a/menus_functions.sh
+++ b/menus_functions.sh
@@ -186,7 +186,7 @@ function showDevInstallMenu () {
     --menu "Install Dev apps from different submenus" \
     25 80 16 \
     "devbase" "dev apps and tools" \
-    "java9" "Java 9 dev env" \
+    "java10" "Java 10 dev env" \
     "javascript" "JavaScript dev env" \
     "nodelts" "NodeJS 8.x LTS" \
     "mongodb3ce" "MongoDB 3 CE" \
@@ -215,8 +215,8 @@ function showDevInstallMenu () {
       "devbase")
         installDevAppsMenu
         ;;
-      "java9")
-        installJava9
+      "java10")
+        installJava10
         ;;
       "javascript")
         installJavascriptMenu
diff --git a/repo_functions.sh b/repo_functions.sh
index bf94401..d4b5289 100644
--- a/repo_functions.sh
+++ b/repo_functions.sh
@@ -377,8 +377,8 @@ javascript-common;apt;javascript;javascript-common
 yarn;npm;javascript;yarn
 emma-cli;npm;javascript;emma-cli
 jshint;npm;javascript;jshint
-oracle-java9-installer;apt;java9;oracle-java9-installer
-oracle-java9-set-default;apt;java9;oracle-java9-set-default
+oracle-java10-installer;apt;java10;oracle-java10-installer
+oracle-java10-set-default;apt;java10;oracle-java10-set-default
 php7.0-cli;apt;php;php7.0-cli
 php-pear;apt;php;php-pear
 composer;apt;php;composer
@@ -515,8 +515,8 @@ faenza-icon-theme;addRepo_NoobslabIcons
 vibrantly-simple-icon-theme;addRepo_Ravefinity
 rave-x-colors-icons;addRepo_Ravefinity
 ravefinity-x-icons;addRepo_Ravefinity
-oracle-java9-installer;addRepo_Java
-oracle-java9-set-default;addRepo_Java
+oracle-java10-installer;addRepo_Java10
+oracle-java10-set-default;addRepo_Java10
 green-recorder;addRepo_GreenRecorder
 hugin;addRepo_Hugin
 simplescreenrecorder;addRepo_SimpleScreenRecorder
@@ -732,10 +732,10 @@ function addRepo_GreenRecorder () {
 }
 
 #
-# Oracle JAVA 7/8/9
+# Oracle JAVA 10
 #
-function addRepo_Java () {
-  addPPA ppa:webupd8team/java
+function addRepo_Java10 () {
+  addPPA ppa:linuxuprising/java
 }
 
 #