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

Oracle Java 10 replaced by OpenJDK 11

Browse source
This commit is contained in:
Francois B. (Makoto) 2019-07-09 23:15:18 +02:00
parent 21baac1ffa
commit 48089fc932
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
menus_functions_ub1804.sh
View file

@ -198,7 +198,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" \
"java10" "Java 10 dev env" \ "java11" "OpenJDK Java 11 dev env" \
"javascript" "JavaScript dev env" \ "javascript" "JavaScript dev env" \
"mongodbce" "MongoDB CE" \ "mongodbce" "MongoDB CE" \
"php" "PHP dev env" \ "php" "PHP dev env" \
@ -228,8 +228,8 @@ function showDevInstallMenu () {
"devbase") "devbase")
installAppsFromListMenu dev installAppsFromListMenu dev
;; ;;
"java10") "java11")
installAppsFromListMenu java10 installAppsFromListMenu java11
;; ;;
"javascript") "javascript")
installAppsFromListMenu javascript installAppsFromListMenu javascript

14
repo_functions_ub1804.sh
View file

@ -342,8 +342,7 @@ ionic;npm;javascript;ionic
cordova;npm;javascript;cordova cordova;npm;javascript;cordova
eslint;npm;javascript;eslint eslint;npm;javascript;eslint
web-ext;npm;javascript;web-ext web-ext;npm;javascript;web-ext
oracle-java10-installer;apt;java10;oracle-java10-installer openjdk-11-jdk;apt;java11;openjdk-11-jdk
oracle-java10-set-default;apt;java10;oracle-java10-set-default
php7.2-cli;apt;php;php7.2-cli php7.2-cli;apt;php;php7.2-cli
php-pear;apt;php;php-pear php-pear;apt;php;php-pear
composer;apt;php;composer composer;apt;php;composer
@ -1046,17 +1045,8 @@ function addRepo_AndroidStudio () {
# #
AppsPreTrtFct="opera-stable;opera_PreTrtFct AppsPreTrtFct="opera-stable;opera_PreTrtFct
steam;steam_PreTrtFct steam;steam_PreTrtFct
wireshark;wireshark_PreTrtFct wireshark;wireshark_PreTrtFct"
oracle-java10-installer;java10_PreTrtFct
oracle-java10-set-default;java10_PreTrtFct"
#
# JAVA 10
#
function java10_PreTrtFct () {
runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \
"accepting Oracle Java SE 10 licence agreement"
}
# #
# Opera # Opera
# #