francois/yggdrasil_ng
francois/yggdrasil_ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Oracle JAVA 8/9 replaced by 10

Browse source
This commit is contained in:
Francois B 2018-05-04 00:20:39 +02:00
parent 2fd0ddb134
commit dc613d80f2
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
install_functions.sh
View file

@ -615,21 +615,21 @@ function installJavascriptMenu () {
} }
# #
# install JAVA 9 (headless) # install JAVA 10 (headless)
# #
function installJava9 () { function installJava10 () {
runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
"accepting Oracle Java SE 9 licence agreement" "accepting Oracle Java SE 10 licence agreement"
installAppsFromList java9 installAppsFromList java10
} }
# #
# install JAVA 9 (Menu) # install JAVA 10 (Menu)
# #
function installJava9Menu () { function installJava10Menu () {
runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
"accepting Oracle Java SE 9 licence agreement" "accepting Oracle Java SE 10 licence agreement"
installAppsFromListMenu java9 installAppsFromListMenu java10
} }
# #

6
menus_functions.sh
View file

@ -186,7 +186,7 @@ function showDevInstallMenu () {
--menu "Install Dev apps from different submenus" \ --menu "Install Dev apps from different submenus" \
25 80 16 \ 25 80 16 \
"devbase" "dev apps and tools" \ "devbase" "dev apps and tools" \
"java9" "Java 9 dev env" \ "java10" "Java 10 dev env" \
"javascript" "JavaScript dev env" \ "javascript" "JavaScript dev env" \
"nodelts" "NodeJS 8.x LTS" \ "nodelts" "NodeJS 8.x LTS" \
"mongodb3ce" "MongoDB 3 CE" \ "mongodb3ce" "MongoDB 3 CE" \
@ -215,8 +215,8 @@ function showDevInstallMenu () {
"devbase") "devbase")
installDevAppsMenu installDevAppsMenu
;; ;;
"java9") "java10")
installJava9 installJava10
;; ;;
"javascript") "javascript")
installJavascriptMenu installJavascriptMenu

14
repo_functions.sh
View file

@ -377,8 +377,8 @@ javascript-common;apt;javascript;javascript-common
yarn;npm;javascript;yarn yarn;npm;javascript;yarn
emma-cli;npm;javascript;emma-cli emma-cli;npm;javascript;emma-cli
jshint;npm;javascript;jshint jshint;npm;javascript;jshint
oracle-java9-installer;apt;java9;oracle-java9-installer oracle-java10-installer;apt;java10;oracle-java10-installer
oracle-java9-set-default;apt;java9;oracle-java9-set-default oracle-java10-set-default;apt;java10;oracle-java10-set-default
php7.0-cli;apt;php;php7.0-cli php7.0-cli;apt;php;php7.0-cli
php-pear;apt;php;php-pear php-pear;apt;php;php-pear
composer;apt;php;composer composer;apt;php;composer
@ -515,8 +515,8 @@ faenza-icon-theme;addRepo_NoobslabIcons
vibrantly-simple-icon-theme;addRepo_Ravefinity vibrantly-simple-icon-theme;addRepo_Ravefinity
rave-x-colors-icons;addRepo_Ravefinity rave-x-colors-icons;addRepo_Ravefinity
ravefinity-x-icons;addRepo_Ravefinity ravefinity-x-icons;addRepo_Ravefinity
oracle-java9-installer;addRepo_Java oracle-java10-installer;addRepo_Java10
oracle-java9-set-default;addRepo_Java oracle-java10-set-default;addRepo_Java10
green-recorder;addRepo_GreenRecorder green-recorder;addRepo_GreenRecorder
hugin;addRepo_Hugin hugin;addRepo_Hugin
simplescreenrecorder;addRepo_SimpleScreenRecorder simplescreenrecorder;addRepo_SimpleScreenRecorder
@ -732,10 +732,10 @@ function addRepo_GreenRecorder () {
} }
# #
# Oracle JAVA 7/8/9 # Oracle JAVA 10
# #
function addRepo_Java () { function addRepo_Java10 () {
addPPA ppa:webupd8team/java addPPA ppa:linuxuprising/java
} }
# #