From 7f656f7bf39814b435c8f427080655903e8d3171 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sat, 24 Dec 2022 14:12:11 +0100
Subject: [PATCH] Update Firefox to ESR 91.12.0 #63

---
 scripts/install-firefox.cmd |  7 +++++--
 software/browser.csv        | 10 ++++++----
 tools/reset-firefox.cmd     |  9 +++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 tools/reset-firefox.cmd

diff --git a/scripts/install-firefox.cmd b/scripts/install-firefox.cmd
index e86fc94..47a3bb2 100644
--- a/scripts/install-firefox.cmd
+++ b/scripts/install-firefox.cmd
@@ -13,7 +13,7 @@ if NOT EXIST %SOFTWARE%\%EXE% (
 set FIREFOXBASE="%ProgramFiles%\Mozilla Firefox"
 
 set BADGERFILE=%SOFTWARE%\privacybadger-addon.xpi
-set BADGERTARGET=jid1-MnnxcxisBPnSXQ@jetpack.xpi
+set BADGERTARGET=jid1-MnnxcxisBPnSXQ-eff@jetpack.xpi
 
 set UBLOCKFILE=%SOFTWARE%\ublockorigin-addon.xpi
 set UBLOCKTARGET=uBlock0@raymondhill.net.xpi
@@ -23,6 +23,9 @@ set TPMTARGET=info@teampasswordmanager.com.xpi
 
 echo ####### %0 #######
 
+echo killing firefox ...
+taskkill /f /im firefox.exe 1>nul 2>nul
+
 cd %SOFTWARE%
 @echo on
 firefox-setup.exe /S /MaintenanceService=false /TaskbarShortcut=false /RegisterDefaultAgent=false
@@ -58,7 +61,7 @@ copy /Y %BADGERFILE% %FIREFOXBASE%\distribution\extensions\%BADGERTARGET%
 echo installing uBlock to fight even more internet bullshit ...
 copy /Y %UBLOCKFILE% %FIREFOXBASE%\distribution\extensions\%UBLOCKTARGET%
 
-echo installing Team PAssword Manager plugin ...
+echo installing Team Password Manager plugin ...
 copy /Y %TPMFILE% %FIREFOXBASE%\distribution\extensions\%TPMTARGET%
 
 echo ####### %0 #######
diff --git a/software/browser.csv b/software/browser.csv
index 4aba927..8b3977d 100644
--- a/software/browser.csv
+++ b/software/browser.csv
@@ -1,4 +1,6 @@
-https://ftp.mozilla.org/pub/firefox/releases/91.0.2/win64/en-US/Firefox%20Setup%2091.0.2.exe firefox-setup.exe
-https://addons.mozilla.org/firefox/downloads/file/3719054/ublock_origin-1.33.2-an+fx.xpi ublockorigin-addon.xpi
-https://addons.mozilla.org/firefox/downloads/file/3719726/privacy_badger-2021.2.2-an+fx.xpi privacybadger-addon.xpi
-https://addons.mozilla.org/firefox/downloads/file/3770188/team_password_manager-3.15.15-fx.xpi tpm-addon.xpi
+https://ftp.mozilla.org/pub/firefox/releases/91.13.0esr/win64/en-US/Firefox%20Setup%2091.13.0esr.exe firefox-setup.exe
+#https://ftp.mozilla.org/pub/firefox/releases/91.9.1esr/win64/en-US/Firefox%20Setup%2091.9.1esr.exe firefox-setup.exe
+https://addons.mozilla.org/firefox/downloads/file/4047353/ublock_origin-1.46.0.xpi ublockorigin-addon.xpi
+https://addons.mozilla.org/firefox/downloads/file/4031429/team_password_manager_official-4.21.18.xpi tpm-addon.xpi
+https://www.eff.org/files/privacy-badger-latest.xpi privacybadger-addon.xpi
+
diff --git a/tools/reset-firefox.cmd b/tools/reset-firefox.cmd
new file mode 100644
index 0000000..0aacc0d
--- /dev/null
+++ b/tools/reset-firefox.cmd
@@ -0,0 +1,9 @@
+@echo off
+
+echo killing firefox ...
+taskkill /f /im firefox.exe 1>nul 2>nul
+
+echo deleting user profile ...
+deltree %USERPROFILE%\AppData\Local\Mozilla
+deltree %USERPROFILE%\AppData\LocalLow\Mozilla
+deltree %USERPROFILE%\AppData\Roaming\Mozilla