diff --git a/Makefile b/Makefile index c6eb5c1..372c606 100644 --- a/Makefile +++ b/Makefile @@ -28,22 +28,21 @@ packages: sudo apt install -y $(PACKAGES) firefox: +FIREFOX_KEYRING := /etc/apt/keyrings/packages.mozilla.org.asc +MOZILLA_LIST := /etc/apt/sources.list.d/mozilla.list +MOZILLA_PREF := /etc/apt/preferences.d/mozilla +KEYRING_URL := https://packages.mozilla.org/apt/repo-signing-key.gpg + + @echo "Adding Mozilla signing key..." sudo install -d -m 0755 /etc/apt/keyrings - wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | \ - sudo tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null - - gpg -n -q --import --import-options import-show \ - /etc/apt/keyrings/packages.mozilla.org.asc | \ - awk '/pub/{getline; gsub(/^ +| +$$/,""); \ - if($$0 == "35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3") \ - print "\nThe key fingerprint matches ("$$0").\n"; \ - else \ - print "\nVerification failed: the fingerprint ("$$0") does not match the expected one.\n"}' - - echo "Types: deb\nURIs: https://packages.mozilla.org/apt\nSuites: mozilla\nComponents: main\nSigned-By: /etc/apt/keyrings/packages.mozilla.org.asc" | \ - sudo tee /etc/apt/sources.list.d/mozilla.sources - + wget -q $(KEYRING_URL) -O- | sudo tee $(FIREFOX_KEYRING) > /dev/null + @echo "Adding Mozilla APT repository..." + echo "deb [signed-by=$(FIREFOX_KEYRING)] https://packages.mozilla.org/apt mozilla main" | sudo tee $(MOZILLA_LIST) > /dev/null + @echo "Configuring apt preferences to prioritize Mozilla..." + echo "Package: *\nPin: origin packages.mozilla.org\nPin-Priority: 1000" | sudo tee $(MOZILLA_PREF) > /dev/null + @echo "Updating package lists..." sudo apt-get update + @echo "Installing Firefox..." sudo apt-get install -y firefox firefox-l10n-ru qtfix: