diff --git a/optional/install-antivir.cmd b/optional/install-antivir.cmd index c1e91a8..86f4bf2 100644 --- a/optional/install-antivir.cmd +++ b/optional/install-antivir.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\F-SecureNetworkInstaller-AV_AVTR20F930_.exe diff --git a/optional/install-ausweisapp2.cmd b/optional/install-ausweisapp2.cmd index ad690dc..73f30cd 100644 --- a/optional/install-ausweisapp2.cmd +++ b/optional/install-ausweisapp2.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-bluejeans.cmd b/optional/install-bluejeans.cmd index 218d1c3..aae03ef 100644 --- a/optional/install-bluejeans.cmd +++ b/optional/install-bluejeans.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-citrixworkspace.cmd b/optional/install-citrixworkspace.cmd index c52a194..068218b 100644 --- a/optional/install-citrixworkspace.cmd +++ b/optional/install-citrixworkspace.cmd @@ -1,12 +1,25 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\citrixworkspace-setup.exe +set EXE2=..\software\nsepa_setup.exe +set MSI=ICAWebWrapper.msi +set CITRIXROOT="%ProgramFiles(x86)%\Citrix" if NOT EXIST %EXE% ( echo ERROR: %EXE% not found! echo GOTO: https://www.citrix.com/de-de/downloads/workspace-app/workspace-app-for-windows-long-term-service-release - echo and save the file as "citrixworkspace-setup.exe" in folder "software" ! + echo and save the file as "citrixworkspace-setup.exe" in folder "software"! + echo. + pause + exit /b +) + +if NOT EXIST %EXE2% ( + echo ERROR: %EXE2% not found! + echo get the file and save it in folder "software"! + echo. pause exit /b ) @@ -23,6 +36,23 @@ reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\S reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run32" ^ /v "Redirector" /d 030000005e06c842d402d701 /t REG_BINARY /f +echo installing Citrix gateway endpoint Analysis Plug-in ... +start /wait %EXE2% + +echo installing Citrix ICA web wrapper ... +cd %CITRIXROOT%\"Citrix Workspace*" + +if NOT EXIST %MSI% ( + echo ERROR: %MSI% not found! + echo ####### %0 ####### + pause + exit /b +) + +@echo on +msiexec /i %MSI% /quiet +@echo off + echo ####### %0 ####### pause diff --git a/optional/install-dbbrowser.cmd b/optional/install-dbbrowser.cmd index b9f3417..3c9997e 100644 --- a/optional/install-dbbrowser.cmd +++ b/optional/install-dbbrowser.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-emclient.cmd b/optional/install-emclient.cmd index e3c2c29..67597a2 100644 --- a/optional/install-emclient.cmd +++ b/optional/install-emclient.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-hakchi2.cmd b/optional/install-hakchi2.cmd index bd96282..4b9c284 100644 --- a/optional/install-hakchi2.cmd +++ b/optional/install-hakchi2.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\hakchi2_config.ini set ZIP=..\software\hakchi2.zip diff --git a/optional/install-horizon.cmd b/optional/install-horizon.cmd index a78abfa..bd51cbd 100644 --- a/optional/install-horizon.cmd +++ b/optional/install-horizon.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\horizon-setup.exe diff --git a/optional/install-inkscape.cmd b/optional/install-inkscape.cmd index 58cc2ea..159862a 100644 --- a/optional/install-inkscape.cmd +++ b/optional/install-inkscape.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\inkscape-setup.exe set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-iview.cmd b/optional/install-iview.cmd index 50dc303..45a60bd 100644 --- a/optional/install-iview.cmd +++ b/optional/install-iview.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\iview-setup.exe set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-java.cmd b/optional/install-java.cmd index ad3f38b..c6ed6d8 100644 --- a/optional/install-java.cmd +++ b/optional/install-java.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-java.txt set EXE=..\software\java-setup.exe diff --git a/optional/install-keepass2.cmd b/optional/install-keepass2.cmd index 29bd7be..79a8914 100644 --- a/optional/install-keepass2.cmd +++ b/optional/install-keepass2.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-keepass2.txt set EXE=..\software\keepass2-setup.exe diff --git a/optional/install-mame.cmd b/optional/install-mame.cmd index 6476247..6b78bc2 100644 --- a/optional/install-mame.cmd +++ b/optional/install-mame.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set T=c:\TEMP set ZIP=..\software\mame64.7z diff --git a/optional/install-moneyplex.cmd b/optional/install-moneyplex.cmd index 079167a..e0fe0d8 100644 --- a/optional/install-moneyplex.cmd +++ b/optional/install-moneyplex.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-moneyxplex.txt set EXE=..\software\moneyplex-setup.exe diff --git a/optional/install-motorescue.cmd b/optional/install-motorescue.cmd index a19e719..1a89ab9 100644 --- a/optional/install-motorescue.cmd +++ b/optional/install-motorescue.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\motorescue-setup.exe set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-obsstudio.cmd b/optional/install-obsstudio.cmd index 183d5fe..ae79e28 100644 --- a/optional/install-obsstudio.cmd +++ b/optional/install-obsstudio.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\obsstudio-setup.exe set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-openvpn.cmd b/optional/install-openvpn.cmd index f8d11ce..6b4cc95 100644 --- a/optional/install-openvpn.cmd +++ b/optional/install-openvpn.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-pdf24.cmd b/optional/install-pdf24.cmd index f691f8b..1b93a47 100644 --- a/optional/install-pdf24.cmd +++ b/optional/install-pdf24.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-purebasic.cmd b/optional/install-purebasic.cmd index f6ad5da..358a69a 100644 --- a/optional/install-purebasic.cmd +++ b/optional/install-purebasic.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set T=c:\TEMP diff --git a/optional/install-python2.cmd b/optional/install-python2.cmd index 76848c7..21a1510 100644 --- a/optional/install-python2.cmd +++ b/optional/install-python2.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-seafile.cmd b/optional/install-seafile.cmd index 5974f27..4f1f58f 100644 --- a/optional/install-seafile.cmd +++ b/optional/install-seafile.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set SOFTWARE=..\software diff --git a/optional/install-sharemouse.cmd b/optional/install-sharemouse.cmd index 5d26b21..cde62e9 100644 --- a/optional/install-sharemouse.cmd +++ b/optional/install-sharemouse.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-sharemouse.txt set EXE=..\software\sharemouse-setup.exe diff --git a/optional/install-snapcontrol.cmd b/optional/install-snapcontrol.cmd index 31ef59b..5098a31 100644 --- a/optional/install-snapcontrol.cmd +++ b/optional/install-snapcontrol.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set T=C:\TEMP set ZIP=..\software\snapcontrol.zip diff --git a/optional/install-softmaker.cmd b/optional/install-softmaker.cmd index 6233206..1eedb1d 100644 --- a/optional/install-softmaker.cmd +++ b/optional/install-softmaker.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set OPT=..\optional set CONFIG=config diff --git a/optional/install-sonos2.cmd b/optional/install-sonos2.cmd index 68fb2d4..798fe36 100644 --- a/optional/install-sonos2.cmd +++ b/optional/install-sonos2.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\sonos2-setup.exe set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-spotify.cmd b/optional/install-spotify.cmd index 8facabf..4934eb4 100644 --- a/optional/install-spotify.cmd +++ b/optional/install-spotify.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\spotify-setup.exe diff --git a/optional/install-steam.cmd b/optional/install-steam.cmd index 478e15a..e8fb34d 100644 --- a/optional/install-steam.cmd +++ b/optional/install-steam.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\steam-setup.exe set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd index 80d2ce8..1651417 100644 --- a/optional/install-totalcommander.cmd +++ b/optional/install-totalcommander.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\totalcommander-setup.exe set KEY=..\comany\wincmd.key diff --git a/optional/install-vcesimulator.cmd b/optional/install-vcesimulator.cmd index 42c52d9..c75afb3 100644 --- a/optional/install-vcesimulator.cmd +++ b/optional/install-vcesimulator.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-vcesimulator.txt set EXE=..\software\vce_exam_simulator_setup.exe diff --git a/optional/install-virtualbox.cmd b/optional/install-virtualbox.cmd index 5f235d8..f930f7f 100644 --- a/optional/install-virtualbox.cmd +++ b/optional/install-virtualbox.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set EXE=..\software\virtualbox-setup.exe set VBOXMANAGE="%ProgramFiles%\Oracle\VirtualBox\VBoxManage.exe" diff --git a/optional/install-vscode.cmd b/optional/install-vscode.cmd index 9d24366..78d7701 100644 --- a/optional/install-vscode.cmd +++ b/optional/install-vscode.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-vscode.txt set EXE=..\software\vscode-setup.exe diff --git a/optional/install-winauth.cmd b/optional/install-winauth.cmd index 6df3166..e1122ac 100644 --- a/optional/install-winauth.cmd +++ b/optional/install-winauth.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set ZIP=..\software\winauth.zip set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs" diff --git a/optional/install-xojo.cmd b/optional/install-xojo.cmd index 75c5655..f574d08 100644 --- a/optional/install-xojo.cmd +++ b/optional/install-xojo.cmd @@ -1,5 +1,6 @@ @echo off call check-for-admin +if %ERRORLEVEL% neq 0 exit /b set CONFIG=config\install-xojo.txt set EXE=..\software\xojo-setup.exe diff --git a/software/other.csv b/software/other.csv index 7ea6c88..e772594 100644 --- a/software/other.csv +++ b/software/other.csv @@ -1,5 +1,6 @@ dummy setacl.zip dummy citrixworkspace-setup.exe +dummy nsepa_setup.exe dummy xojo-setup.exe dummy usb2serial-PL2303-setup.exe dummy epson-WFC5210-setup.exe