From 055c33e39b516050d2eb2a97f9c60d72a3f5846f Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:10:17 -0400 Subject: [PATCH] Firefox Rapid Release: skip adding mozilla PPA on PiOS Bookworm --- apps/Firefox Rapid Release/install | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/Firefox Rapid Release/install b/apps/Firefox Rapid Release/install index 82eb8b6ceb..81a65f4bd8 100755 --- a/apps/Firefox Rapid Release/install +++ b/apps/Firefox Rapid Release/install @@ -34,10 +34,14 @@ Pin-Priority: -1' | sudo tee /etc/apt/preferences.d/firefox >/dev/null # also allow unattented upgrades to upgrade from this ppa if unattented upgrades is enabled case $__os_codename in bookworm) - # remove old ppa if present - sudo rm -f /etc/apt/sources.list.d/mozillateam-ubuntu-ppa-bionic.list - debian_ppa_installer "mozillateam/ppa" "jammy" "0AB215679C571D1C8325275B9BDB3D89CE49EC21" || exit 1 - echo 'Unattended-Upgrade::Allowed-Origins:: "LP-PPA-mozillateam:jammy";' | sudo tee /etc/apt/apt.conf.d/51unattended-upgrades-firefox >/dev/null + if [ -f /etc/rpi-issue ]; then + status "PiOS Bookworm supports the latest HW Accelerated Firefox out of the box. Skipping adding Mozilla PPA" + else + # remove old ppa if present + sudo rm -f /etc/apt/sources.list.d/mozillateam-ubuntu-ppa-bionic.list + debian_ppa_installer "mozillateam/ppa" "jammy" "0AB215679C571D1C8325275B9BDB3D89CE49EC21" || exit 1 + echo 'Unattended-Upgrade::Allowed-Origins:: "LP-PPA-mozillateam:jammy";' | sudo tee /etc/apt/apt.conf.d/51unattended-upgrades-firefox >/dev/null + fi ;; bullseye) # remove old ppa if present