Merge pull request #2725 from pentoo/updates20260323a

pentoo-updater: jdk-25
This commit is contained in:
github-actions[bot] 2026-03-24 02:22:22 +00:00 committed by GitHub
commit 9f6552ec02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -94,10 +94,10 @@ set_java() {
return 1
fi
java_system=$(eselect java-vm show system | tail -n 1 | tr -d " ")
if [ "${java_system/17/}" != "${java_system}" ]; then
if [ "${java_system/25/}" != "${java_system}" ]; then
return 0
fi
wanted_java=$(eselect java-vm list | grep --color=never 21 | tr -d "[]" | awk '{print $2,$1}' | sort | head -n 1 | awk '{print $2}')
wanted_java=$(eselect java-vm list | grep --color=never 25 | 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"
@ -107,7 +107,7 @@ set_java() {
return 1
fi
else
printf "Failed to detect available jdk-21\n"
printf "Failed to detect available jdk-25\n"
return 0
fi
}