mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-02 19:50:51 +02:00
pentoo-updater: gentoo fixes are in, set java system-vm back to 11
This commit is contained in:
parent
97ca9be8cb
commit
1aa2a53de1
1 changed files with 3 additions and 3 deletions
|
|
@ -55,10 +55,10 @@ setup_env() {
|
|||
|
||||
set_java() {
|
||||
java_system=$(eselect java-vm show system | tail -n 1 | tr -d " ")
|
||||
if [ "${java_system/8/}" != "${java_system}" ]; then
|
||||
if [ "${java_system/11/}" != "${java_system}" ]; then
|
||||
return 0
|
||||
fi
|
||||
wanted_java=$(eselect java-vm list | grep --color=never 8 | tr -d "[]" | awk '{print $2,$1}' | sort | head -n 1 | awk '{print $2}')
|
||||
wanted_java=$(eselect java-vm list | grep --color=never 11 | tr -d "[]" | awk '{print $2,$1}' | sort | head -n 1 | awk '{print $2}')
|
||||
if [ -n "${wanted_java}" ]; then
|
||||
if eselect java-vm set system "${wanted_java}"; then
|
||||
printf "Successfully set system java vm\n"
|
||||
|
|
@ -68,7 +68,7 @@ set_java() {
|
|||
return 1
|
||||
fi
|
||||
else
|
||||
printf "Failed to detect available jdk-8\n"
|
||||
printf "Failed to detect available jdk-11\n"
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue