From 42779f3b27bbb138cd4a04494ab6780124eb9846 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 28 Feb 2021 21:25:39 +0100
Subject: [PATCH] .

---
 scripts/install-firefox.cmd | 16 +++++++++-------
 scripts/uninstall-apps.ps1  |  6 +++---
 scripts/unpack-zipfiles.cmd |  2 +-
 software/browser.csv        |  4 ++--
 wim/get-wiminfo.cmd         |  4 ++++
 wim/list-packages.cmd       |  5 -----
 6 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 wim/list-packages.cmd

diff --git a/scripts/install-firefox.cmd b/scripts/install-firefox.cmd
index d680e11..6169ab3 100644
--- a/scripts/install-firefox.cmd
+++ b/scripts/install-firefox.cmd
@@ -1,12 +1,12 @@
 @echo off
 
-set CONF=config\firefox
+set CONFIG=config\firefox
 set SCRIPTS=..\scripts
 set SOFTWARE=..\software
-set MSI=firefox-setup.msi
+set EXE=firefox-setup.exe
 
-if NOT EXIST %SOFTWARE%\%MSI% (
-  echo ERROR: %SOFTWARE%\%MSI% not found!
+if NOT EXIST %SOFTWARE%\%EXE% (
+  echo ERROR: %SOFTWARE%\%EXE% not found!
   exit /b
 )
 
@@ -27,13 +27,15 @@ set BITWARDENTARGET={446900e4-71c2-419f-a6a7-df9c091e268b}.xpi
 echo ####### %0 #######
 
 @echo on
-msiexec /i %MSI% /passive
+cd %SOFTWARE%
+firefox-setup.exe /S /MaintenanceService=false /TaskbarShortcut=false /RegisterDefaultAgent=false
+timeout /T 10
 @echo off
 cd %SCRIPTS%
 
 rem copy config ...
-copy /Y %CONF%\local-settings.js %FIREFOXBASE%\defaults\pref
-copy /Y %CONF%\mozilla.cfg %FIREFOXBASE%
+copy /Y %CONFIG%\local-settings.js %FIREFOXBASE%\defaults\pref
+copy /Y %CONFIG%\mozilla.cfg %FIREFOXBASE%
 
 echo disabling FireFox updates (all users) ...
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Mozilla\Firefox" ^
diff --git a/scripts/uninstall-apps.ps1 b/scripts/uninstall-apps.ps1
index 690fae3..d87e1a2 100644
--- a/scripts/uninstall-apps.ps1
+++ b/scripts/uninstall-apps.ps1
@@ -11,9 +11,9 @@ Get-AppxPackage -AllUsers |
   Remove-AppxPackage
 
 Get-AppxProvisionedPackage -online |
-  where-object {$_.name -notlike "*calc*"} |
-  where-object {$_.name -notlike "*store*"} |
-  where-object {$_.name -notlike "*terminal*"} |
+  where-object {$_.displayname -notlike "*calc*"} |
+  where-object {$_.displayname -notlike "*store*"} |
+  where-object {$_.displayname -notlike "*terminal*"} |
   Remove-AppxProvisionedPackage -online
 
 # make sure that the calculator is installed ...
diff --git a/scripts/unpack-zipfiles.cmd b/scripts/unpack-zipfiles.cmd
index bce39f5..2476ac2 100644
--- a/scripts/unpack-zipfiles.cmd
+++ b/scripts/unpack-zipfiles.cmd
@@ -42,7 +42,7 @@ echo.
 
 echo BGinfo ...
 mkdir %TOOLS%\bginfo 2>nul
-move /Y %T%\bginfo\Bginfo64.exe %TOOLS%
+move /Y %T%\bginfo\Bginfo64.exe %TOOLS%\bginfo
 copy /Y config\config.bgi %TOOLS%\bginfo
 rd /S /Q %T%\bginfo 2>nul
 echo.
diff --git a/software/browser.csv b/software/browser.csv
index 74a2033..40e0bc0 100644
--- a/software/browser.csv
+++ b/software/browser.csv
@@ -1,5 +1,5 @@
-https://ftp.mozilla.org/pub/firefox/releases/85.0.2/win64/en-US/Firefox%20Setup%2085.0.2.msi firefox-setup.msi
+https://ftp.mozilla.org/pub/firefox/releases/85.0.2/win64/en-US/Firefox%20Setup%2085.0.2.exe firefox-setup.exe
 https://addons.mozilla.org/firefox/downloads/file/3726657/1password_password_manager-1.23.1-fx.xpi 1password-addon.xpi
 https://addons.mozilla.org/firefox/downloads/file/3714988/bitwarden_free_password_manager-1.48.1-an+fx.xpi bitwarden-addon.xpi
 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
\ No newline at end of file
+https://addons.mozilla.org/firefox/downloads/file/3719726/privacy_badger-2021.2.2-an+fx.xpi privacybadger-addon.xpi
diff --git a/wim/get-wiminfo.cmd b/wim/get-wiminfo.cmd
index c47e73e..a7ec889 100644
--- a/wim/get-wiminfo.cmd
+++ b/wim/get-wiminfo.cmd
@@ -11,5 +11,9 @@ GOTO END
 :USAGE
 echo "usage: %0 <FILENAME>"
 
+echo.
+dir /B %SOURCES%\*.esd %SOURCES%\*.wim
+echo.
+
 :END
 
diff --git a/wim/list-packages.cmd b/wim/list-packages.cmd
deleted file mode 100644
index 294e207..0000000
--- a/wim/list-packages.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-set MNT=c:\TEMP\WIM
-
-dism /Image:%MNT% /Get-Packages /Format:Table
-