From 2ce363288a462dbfe9161758a6112776933cf271 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Wed, 17 Jul 2024 23:47:51 +0200
Subject: [PATCH] NEW openvpn version

---
 optional/install-openvpn.cmd | 10 +++++++++-
 software/optional.csv        |  2 +-
 tools/copy-vpnconfig.cmd     | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 tools/copy-vpnconfig.cmd

diff --git a/optional/install-openvpn.cmd b/optional/install-openvpn.cmd
index a1061f6..36783b9 100644
--- a/optional/install-openvpn.cmd
+++ b/optional/install-openvpn.cmd
@@ -6,6 +6,8 @@ set OPT=..\optional
 set SOFTWARE=..\software
 set MSI=openvpn-setup.msi
 
+set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+
 if NOT EXIST %SOFTWARE%\%MSI% (
   echo ERROR: %SOFTWARE%\%MSI% not found!
   exit /b
@@ -20,8 +22,14 @@ msiexec /i %MSI% /q
 @echo off
 cd %OPT%
 
+echo moving OpenVPN startmenu shortcut ...
+move /Y %STARTMENU%\"OpenVPN\OpenVPN GUI.lnk" %STARTMENU%\OpenVPN.lnk
+
+echo removing Inkscape startmenu folder ...
+rd /S /Q %STARTMENU%\"OpenVPN" 2>nul
+
 echo removing Desktop icon ...
-del /F /Q "%PUBLIC%\Desktop\OpenVPN Connect.lnk" 2>nul
+del /F /Q "%PUBLIC%\Desktop\OpenVPN GUI.lnk" 2>nul
 
 echo refreshing desktop (W10 style) ...
 ie4uinit.exe -show
diff --git a/software/optional.csv b/software/optional.csv
index 80043de..b1c2bfc 100644
--- a/software/optional.csv
+++ b/software/optional.csv
@@ -23,7 +23,7 @@ https://media.inkscape.org/dl/resources/file/inkscape-1.2.2_2022-12-09_732a01da6
 https://www.sonos.com/redir/controller_software_pc2 sonos2-setup.exe
 https://download.lenovo.com/lsa/Releases/Rescue_and_Smart_Assistant_v6.1.1.9_signed_setup.exe motorescue-setup.exe
 https://github.com/winauth/winauth/releases/download/3.5.1/WinAuth-3.5.1.zip winauth.zip
-https://swupdate.openvpn.net/as/clients/openvpn-connect-2.7.1.111_signed.msi openvpn-setup.msi
+https://swupdate.openvpn.org/community/releases/OpenVPN-2.6.11-I002-amd64.msi openvpn-setup.msi
 https://cdn-fastly.obsproject.com/downloads/OBS-Studio-27.0.1-Full-Installer-x64.exe obsstudio-setup.exe
 https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe java-setup.exe
 https://www.ausweisapp.bund.de/fileadmin/user_upload/Software/AusweisApp-2.1.0.msi ausweisapp-setup.msi
diff --git a/tools/copy-vpnconfig.cmd b/tools/copy-vpnconfig.cmd
new file mode 100644
index 0000000..03638d3
--- /dev/null
+++ b/tools/copy-vpnconfig.cmd
@@ -0,0 +1,23 @@
+@echo off
+
+IF %1.==. GOTO USAGE
+
+set VPNCONFIG=%1
+set CONFIGDIR=%USERPROFILE%\OpenVPN\config
+set TOOLS=%SystemDrive%\tools
+
+echo ####### %0 #######
+
+echo creating directory [ %CONFIGDIR% ]
+mkdir %CONFIGDIR% 2>nul
+
+echo unzip VPN config files ...
+%TOOLS%\7z e -y -aoa -o%CONFIGDIR% %1 1>nul
+
+echo ####### %0 #######
+GOTO END
+
+:USAGE
+echo "usage: %0 <OpenVPN ZIPFILE>"
+
+:END