From e6a36c0426c592837ef47950689d8236b0d0435e Mon Sep 17 00:00:00 2001 From: USER Date: Fri, 22 Aug 2025 12:40:42 +0100 Subject: [PATCH] . --- .../{CheckExact.bat => CheckSoftware.bat} | 10 +++---- SystemChecks/RunChecks.bat | 28 +++++++++++++++++++ SystemChecks/test.bat | 22 --------------- 3 files changed, 32 insertions(+), 28 deletions(-) rename SystemChecks/{CheckExact.bat => CheckSoftware.bat} (60%) create mode 100644 SystemChecks/RunChecks.bat diff --git a/SystemChecks/CheckExact.bat b/SystemChecks/CheckSoftware.bat similarity index 60% rename from SystemChecks/CheckExact.bat rename to SystemChecks/CheckSoftware.bat index ae70fc4..e0244d9 100644 --- a/SystemChecks/CheckExact.bat +++ b/SystemChecks/CheckSoftware.bat @@ -4,15 +4,13 @@ set path=%PATH% set Software="LibreOffice" set SoftwarePath="C:\Program Files\LibreOffice\program\soffice.exe" - -echo %1 -echo %2 +echo "Checking for %1 at %2" REM Check if LibreOffice is installed -if exist %SoftwarePath% ( - echo "%Software% is installed" +if exist %2 ( + echo "%1 is installed" ) else ( - echo "%Software% is not installed" + echo "%1 is not installed" ) exit /b diff --git a/SystemChecks/RunChecks.bat b/SystemChecks/RunChecks.bat new file mode 100644 index 0000000..9d038ca --- /dev/null +++ b/SystemChecks/RunChecks.bat @@ -0,0 +1,28 @@ + +REM Check if the computer name contains "reception" +echo %COMPUTERNAME% | find /I "reception" >nul +if %errorlevel%==0 ( + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat LibreOffice "C:\Program Files\LibreOffice\program\soffice.exe" + + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Daryou "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Exact "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat ExaminePro "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Kavo "C:\Program Files\LibreOffice\program\soffice.exe" +) + + + +echo %COMPUTERNAME% | find /I "surgery" >nul +if %errorlevel%==0 ( + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Daryou "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Exact "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat ExaminePro "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Kavo "C:\Program Files\LibreOffice\program\soffice.exe" +) + +echo %COMPUTERNAME% | find /I "server2" >nul +if %errorlevel%==0 ( + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat BackupAssist "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Exact "C:\Program Files\LibreOffice\program\soffice.exe" + C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat SafeNet "C:\Program Files\LibreOffice\program\soffice.exe" +) diff --git a/SystemChecks/test.bat b/SystemChecks/test.bat index ce2fb8d..de89ce1 100644 --- a/SystemChecks/test.bat +++ b/SystemChecks/test.bat @@ -16,28 +16,6 @@ if exist "%directoryPath%" ( exit /b -@echo off -setlocal - -REM Define the path to the LibreOffice installation -set libreOfficePath="C:\Program Files\LibreOffice\program\soffice.exe" - -REM Check if the script is running on reception2 -if /I "%COMPUTERNAME%" NEQ "reception2" ( - echo This script must be run on reception2. - exit /b -) - -REM Check if LibreOffice is installed -if exist %libreOfficePath% ( - echo LibreOffice is installed. -) else ( - echo LibreOffice is not installed. -) - -endlocal -exit /b - @echo off