From 253ac1d4b15d6b4ae37d558264942d90b77b3f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Juri=C5=A1i=C4=87?= <ivan@jurisic.org>
Date: Wed, 13 Mar 2024 14:30:48 +0100
Subject: [PATCH] Updated and replaced nightly with offical firefox (nightly
 still in repository if need)

---
 apps/firefox/{firefox-nightly.sh => firefox.sh} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename apps/firefox/{firefox-nightly.sh => firefox.sh} (78%)

diff --git a/apps/firefox/firefox-nightly.sh b/apps/firefox/firefox.sh
similarity index 78%
rename from apps/firefox/firefox-nightly.sh
rename to apps/firefox/firefox.sh
index b735953..d94044c 100755
--- a/apps/firefox/firefox-nightly.sh
+++ b/apps/firefox/firefox.sh
@@ -6,7 +6,7 @@ APT_INST="apt -y install"
 APT_PURGE="apt -y purge"
 APT_REMOVE="apt -y autoremove"
 
-PKG_FIREFOX="firefox-nightly"
+PKG_FIREFOX="firefox"
 
 #### Functions
 check_root() {
@@ -41,14 +41,13 @@ echo -e "\nUpdate apt"
 echo "$APT_UPDATE"
 $APT_UPDATE
 
-echo -ne "\nYou want to install Firefox Nightly ($PKG_FIREFOX)? "
+echo -ne "\nYou want to install Firefox ($PKG_FIREFOX)? "
 
 if choice 2>/dev/null; then
-    echo -ne "\nAdd repository for Firefox Nightly\n"
+    echo -ne "\nAdd repository for Firefox\n"
     $APT_INST apt-transport-https wget
     sudo install -d -m 0755 /etc/apt/keyrings
     wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | 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(/^ +| +$/,""); print "\n"$0"\n"}'
     echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | sudo tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null
     $APT_UPDATE
     echo -ne "\n$APT_INST $PKG_FIREFOX\n"