diff --git a/SystemChecks/CheckInstallPrinter.bat b/SystemChecks/CheckInstallPrinter.bat new file mode 100644 index 0000000..76e3232 --- /dev/null +++ b/SystemChecks/CheckInstallPrinter.bat @@ -0,0 +1,24 @@ +@ECHO OFF +set path=%PATH% + +set myPrintServer=%1 +set myPrinter=%2 + + +REM Check if myPrintServer is reachable +ping -n 1 %myPrintServer% >nul 2>&1 +if errorlevel 1 ( + echo "%myPrintServer% is not reachable" + exit /b +) + +REM Check if myPrinter is available +rundll32 printui.dll,PrintUIEntry /q /t1 /n "\\%myPrintServer%\%myPrinter%" >nul 2>&1 +if errorlevel 1 ( + echo Printer %myPrinter% is not available. +) else ( + echo Printer %myPrinter% is available. + cscript "C:\Windows\System32\Printing_Admin_Scripts\en-US\prnmngr.vbs" -ac -p "\\%myPrintServer%\%myPrinter%" +) + +exit /b \ No newline at end of file diff --git a/SystemChecks/CheckPrinterBrother.bat b/SystemChecks/CheckPrinterBrother.bat index 0413d24..81ddeb7 100644 --- a/SystemChecks/CheckPrinterBrother.bat +++ b/SystemChecks/CheckPrinterBrother.bat @@ -1,4 +1,4 @@ -ECHO OFF +@ECHO OFF set path=%PATH% set myPrintServer=RECEPTION2 diff --git a/SystemChecks/CheckPrinterZebra.bat b/SystemChecks/CheckPrinterZebra.bat index aa07a3e..35e4fb1 100644 --- a/SystemChecks/CheckPrinterZebra.bat +++ b/SystemChecks/CheckPrinterZebra.bat @@ -1,4 +1,4 @@ -ECHO OFF +@ECHO OFF set path=%PATH% set myPrintServer=RECEPTION1 diff --git a/SystemChecks/CheckSoftware.bat b/SystemChecks/CheckSoftware.bat index e0244d9..5ca2d8a 100644 --- a/SystemChecks/CheckSoftware.bat +++ b/SystemChecks/CheckSoftware.bat @@ -1,4 +1,4 @@ -ECHO OFF +@ECHO OFF set path=%PATH% set Software="LibreOffice" diff --git a/SystemChecks/RunChecks.bat b/SystemChecks/RunChecks.bat index 9d038ca..8282323 100644 --- a/SystemChecks/RunChecks.bat +++ b/SystemChecks/RunChecks.bat @@ -1,28 +1,19 @@ +@echo off -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" +setlocal - 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" +@REM Get the Windows version +for /f "tokens=4-5 delims= " %%a in ('ver') do ( + set version=%%a.%%b ) - - -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" +@REM Check if the version is Windows 11 +if "%version%" geq "10.0.22000" ( + echo This script is running on Windows 11. + C:\Scripts\wLocal\SystemChecks\Win11Checks.bat +) else ( + echo This script is not running on Windows 11. Exiting... + exit /b ) -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" -) +endlocal diff --git a/SystemChecks/Win11Checks.bat b/SystemChecks/Win11Checks.bat new file mode 100644 index 0000000..2499a83 --- /dev/null +++ b/SystemChecks/Win11Checks.bat @@ -0,0 +1,29 @@ +@echo off + +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" +) + +C:\Scripts\wLocal\SystemChecks\CheckInstallPrinter.bat ZEBRA RECEPTION1 +echo %errorlevel% \ No newline at end of file