From 3f7002decdca32ca7034ac8bfa2368dd3e715732 Mon Sep 17 00:00:00 2001 From: Sylirre Date: Fri, 10 Jan 2025 01:14:14 +0200 Subject: [PATCH] ubuntu: pre-configure ppas for firefox and thunderbird --- distro-build/ubuntu.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/distro-build/ubuntu.sh b/distro-build/ubuntu.sh index 1194393cb..159597d57 100644 --- a/distro-build/ubuntu.sh +++ b/distro-build/ubuntu.sh @@ -13,7 +13,7 @@ bootstrap_distribution() { --architectures=${arch} \ --variant=apt \ --components="main,universe,multiverse" \ - --include="locales,passwd" \ + --include="locales,passwd,software-properties-common" \ --format=directory \ "${dist_version}" \ "${WORKDIR}/ubuntu-${dist_version}-$(translate_arch "$arch")" @@ -42,6 +42,22 @@ write_plugin() { ${TAB}# Configure en_US.UTF-8 locale. ${TAB}sed -i -E 's/#[[:space:]]?(en_US.UTF-8[[:space:]]+UTF-8)/\1/g' ./etc/locale.gen ${TAB}run_proot_cmd DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales + + ${TAB}# Configure Firefox PPA. + ${TAB}add-apt-repository ppa:mozillateam/firefox-next + ${TAB}cat <<- CONFIG_EOF > ./etc/apt/preferences.d/pin-mozilla-ppa + ${TAB}Package: * + ${TAB}Pin: release o=LP-PPA-mozillateam-firefox-next + ${TAB}Pin-Priority: 9999 + ${TAB}CONFIG_EOF + + ${TAB}# Configure Thunderbird PPA. + ${TAB}add-apt-repository ppa:mozillateam/thunderbird-next + ${TAB}cat <<- CONFIG_EOF > ./etc/apt/preferences.d/pin-thunderbird-ppa + ${TAB}Package: * + ${TAB}Pin: release o=LP-PPA-mozillateam-thunderbird-next + ${TAB}Pin-Priority: 9999 + ${TAB}CONFIG_EOF } EOF }