Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

branchy mcbranchface #2130

Merged
merged 3 commits into from
Oct 22, 2024
Merged

branchy mcbranchface #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84f6685
bootstrap-profile: less quic again
ZeroChaos- Oct 22, 2024
f354b2e
pentoo-updater: java and ruby updates
ZeroChaos- Oct 22, 2024
ac35997
package.mask: xfce4-screensaver isn't broken, pam was
ZeroChaos- Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions profiles/pentoo/base/package.mask
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ sci-libs/mkl
#force sticky upgrade
<app-pda/libplist-2.3

#Not sure how or why, but this won't unlock
xfce-extra/xfce4-screensaver

#Having some stability issues with 3.0.65
#Preventing accidental downgrade with mask
<sys-apps/portage-3.0.66.1-r1
2 changes: 1 addition & 1 deletion profiles/pentoo/bootstrap/package.use
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ net-dns/c-ares -verify-sig
net-dns/libidn2 -verify-sig
net-fs/samba -cups
net-libs/gnutls -verify-sig
net-misc/curl -http2 -http3 -quic -verify-sig
net-misc/curl -curl_quic_openssl -http2 -http3 -quic -verify-sig
net-wireless/bluez -cups
sys-apps/util-linux -udev
sys-apps/util-linux -verify-sig
Expand Down
8 changes: 6 additions & 2 deletions scripts/pentoo-updater.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ set_java() {
if [ "${java_system/17/}" != "${java_system}" ]; then
return 0
fi
wanted_java=$(eselect java-vm list | grep --color=never 17 | tr -d "[]" | awk '{print $2,$1}' | sort | head -n 1 | awk '{print $2}')
wanted_java=$(eselect java-vm list | grep --color=never 21 | 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"
Expand All @@ -107,12 +107,16 @@ set_java() {
return 1
fi
else
printf "Failed to detect available jdk-17\n"
printf "Failed to detect available jdk-21\n"
return 0
fi
}

set_ruby() {
if portageq has_version / dev-lang/ruby:3.2; then
eselect ruby set ruby32
return 0
fi
if portageq has_version / dev-lang/ruby:3.1; then
eselect ruby set ruby31
return 0
Expand Down