From 6702125d3bdd463960d472b56cdb595f75faabaa Mon Sep 17 00:00:00 2001 From: Victor Miasnikov Date: Fri, 30 Jun 2023 10:38:58 +0300 Subject: [PATCH] Scripts: Update some .cmd files for Windows 11 * Add "Windows 11" to cm3CommandShell.CMD * Add "Windows 11" to do-cm3.cmd --- scripts/dev/windows/do-cm3.cmd | 2 ++ scripts/install/windows/cm3CommandShell.CMD | 1 + 2 files changed, 3 insertions(+) diff --git a/scripts/dev/windows/do-cm3.cmd b/scripts/dev/windows/do-cm3.cmd index 0cd690b60c..47659f5044 100644 --- a/scripts/dev/windows/do-cm3.cmd +++ b/scripts/dev/windows/do-cm3.cmd @@ -86,8 +86,10 @@ if NOT exist %SystemRoot%\system32\systeminfo.exe goto ver_NoSysInfo FOR /F "usebackq tokens=3* delims=: " %%i IN (`systeminfo ^| find /I "OS Name"`) DO set _cm3_ThisOS_Long=%%i %%j echo %_cm3_ThisOS_Long% | (find /I "Windows Vista" >NUL:) && ((set _cm3_ThisOS=Vista) & goto ver_Vista) echo %_cm3_ThisOS_Long% | (find /I "Windows 10" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) +echo %_cm3_ThisOS_Long% | (find /I "Windows 11" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Microsoft Windows Server 2016" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Microsoft Windows Server 2019" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) +echo %_cm3_ThisOS_Long% | (find /I "Microsoft Windows Server 2022" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Windows 7" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Windows Server 2008" >NUL:) && ((set _cm3_ThisOS=2008) & goto ver_2008) diff --git a/scripts/install/windows/cm3CommandShell.CMD b/scripts/install/windows/cm3CommandShell.CMD index 5c0b574fd5..a10a6be052 100644 --- a/scripts/install/windows/cm3CommandShell.CMD +++ b/scripts/install/windows/cm3CommandShell.CMD @@ -95,6 +95,7 @@ FOR /F "usebackq tokens=3* delims=: " %%i IN (`systeminfo ^| find /I "OS Name"`) echo %_cm3_ThisOS_Long% | (find /I "Windows Vista" >NUL:) && ((set _cm3_ThisOS=Vista) & goto ver_Vista) echo %_cm3_ThisOS_Long% | (find /I "Windows 7" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Windows 10" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) +echo %_cm3_ThisOS_Long% | (find /I "Windows 11" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Microsoft Windows Server 2016" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Microsoft Windows Server 2019" >NUL:) && ((set _cm3_ThisOS=Win7) & goto ver_7) echo %_cm3_ThisOS_Long% | (find /I "Windows Server 2008" >NUL:) && ((set _cm3_ThisOS=2008) & goto ver_2008)