From de17ddd8fd8de9becb73dcff0c23712a0ac7729a Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 5 Sep 2021 20:51:19 +0200
Subject: [PATCH] removed xnview and added irfan view

---
 optional/config/install-xnview.txt |  6 ------
 optional/install-iview.cmd         | 30 ++++++++++++++++++++++++++
 optional/install-xnview.cmd        | 34 ------------------------------
 software/optional.csv              |  2 +-
 4 files changed, 31 insertions(+), 41 deletions(-)
 delete mode 100644 optional/config/install-xnview.txt
 create mode 100644 optional/install-iview.cmd
 delete mode 100644 optional/install-xnview.cmd

diff --git a/optional/config/install-xnview.txt b/optional/config/install-xnview.txt
deleted file mode 100644
index 7985762..0000000
--- a/optional/config/install-xnview.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[Setup]
-Lang=en
-Dir=C:\Program Files\XnViewMP
-Group=XnViewMP
-NoIcons=0
-Tasks=desktopicon
diff --git a/optional/install-iview.cmd b/optional/install-iview.cmd
new file mode 100644
index 0000000..d2c63b6
--- /dev/null
+++ b/optional/install-iview.cmd
@@ -0,0 +1,30 @@
+@echo off
+
+set EXE=..\software\iview-setup.exe
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  echo GOTO: https://www.irfanview.com/64bit.htm
+  echo and save the file as "iview-setup.exe" in folder "software" !
+  pause
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo installing IrfanView ...
+start /wait %EXE% /silent /desktop=1 /folder="c:\iview" /group=1 /allusers=1 /assoc=1
+
+echo removing IrfanView startmenu folder ...
+rd /S /Q %STARTMENU%\"IrfanView" 2>nul
+
+echo moving IrfanView desktop links to Startmenu ...
+move /Y "%PUBLIC%\Desktop\IrfanView*.lnk" %STARTMENU%
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-xnview.cmd b/optional/install-xnview.cmd
deleted file mode 100644
index 43301ea..0000000
--- a/optional/install-xnview.cmd
+++ /dev/null
@@ -1,34 +0,0 @@
-@echo off
-
-set CONFIG=config\install-xnview.txt
-set EXE=..\software\xnview-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo killing XnView processes...
-taskkill /F /IM xnviewmp.exe 2>nul
-
-echo installing XnView ...
-start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
-
-echo removing XnView desktop link ...
-del /F "%USERPROFILE%\Desktop\XnViewMP.lnk"
-
-echo moving XnView startmenu shortcut ...
-move /Y %STARTMENU%\"XnViewMP\XnViewMP.lnk" %STARTMENU%
-
-echo removing XnView startmenu folder ...
-rd /S /Q %STARTMENU%\"XnViewMP" 2>nul
-
-rem refresh desktop (W10 style)
-ie4uinit.exe -show
-
-echo ####### %0 #######
-pause
-
diff --git a/software/optional.csv b/software/optional.csv
index f8cfef8..0b108a9 100644
--- a/software/optional.csv
+++ b/software/optional.csv
@@ -16,7 +16,7 @@ https://statics.teams.cdn.office.net/production-windows-x64/1.4.00.2879/Teams_wi
 https://totalcommander.ch/win/fixed/tcmd951x64.exe totalcommander-setup.exe
 https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18-142142-Win.exe virtualbox-setup.exe
 https://code.visualstudio.com/sha/download?build=stable&os=win32-x64 vscode-setup.exe
-https://download.xnview.com/XnViewMP-win-x64.exe xnview-setup.exe
+http://www.irfanview.info/files/iview458_x64_setup.exe iview-setup.exe
 https://inkscape.org/gallery/item/24646/inkscape-1.0.2-2-x64.exe inkscape-setup.exe
 https://swdl.bluejeans.com/desktop-app/win/2.31.114.0/BlueJeans.2.31.114u.msi bluejeans-setup.msi
 https://www.sonos.com/redir/controller_software_pc sonospc-setup.exe