[neon/infrastructure/pangea-data] imager/build-hooks-neon: firefox has transitioned to the mozilla provided debs in noble

[Carlos De Maine]

Git commit 82acbd12070ed446c181a39bde1c6ca937bb452f by Carlos De Maine.
Committed on 17/08/2024 at 06:52.
Pushed by carlosdem into branch 'master'.

firefox has transitioned to the mozilla provided debs in noble

M  +18   -2    imager/build-hooks-neon/012-firefox.chroot

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/82acbd12070ed446c181a39bde1c6ca937bb452f

diff --git a/imager/build-hooks-neon/012-firefox.chroot b/imager/build-hooks-neon/012-firefox.chroot
index 13a0909..f5322e0 100644
--- a/imager/build-hooks-neon/012-firefox.chroot
+++ b/imager/build-hooks-neon/012-firefox.chroot
@@ -6,11 +6,13 @@
 
 set -ex
 
-. /etc/os-release
-
 echo "build-hooks-neon --  running 012-firefox.chroot"
 echo "Installing Firefox from PPA"
 
+. /etc/os-release
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
+
 mv /etc/apt/apt.conf.d/00http-proxy /tmp/
 sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
 apt-get update
@@ -19,3 +21,17 @@ mv /tmp/00http-proxy /etc/apt/apt.conf.d/
 sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
 apt-get update
 apt-cache policy firefox
+
+else
+
+# firefox has transitioned to the mozilla provided debs in noble
+mv /etc/apt/apt.conf.d/00http-proxy /tmp/
+sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-get -y --allow-downgrades install firefox
+mv /tmp/00http-proxy /etc/apt/apt.conf.d/
+sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-cache policy firefox
+
+fi