Fix detect-os

Author: arjunsuresh

script/detect-os/run.bat

@@ -12,34 +12,32 @@ for /f "tokens=4-7 delims=[.] " %%i in ('ver') do (
 )
 
 REM Get OS caption and version from systeminfo output
-for /f "tokens=2* delims=:" %%i in ('systeminfo ^| findstr /B /C:"OS Name"') do set OS_CAPTION=%%j
-for /f "tokens=2* delims=:" %%i in ('systeminfo ^| findstr /B /C:"OS Version"') do set OS_VERSION=%%j
+for /f "tokens=2* delims=:" %%i in ('systeminfo ^| findstr /B /C:"OS Name"') do set "OS_CAPTION=%%j"
+for /f "tokens=2* delims=:" %%i in ('systeminfo ^| findstr /B /C:"OS Version"') do set "OS_VERSION=%%j"
 
 REM Trim leading spaces
-for /f "tokens=* delims= " %%i in ("%OS_CAPTION%") do set OS_CAPTION=%%i
-for /f "tokens=* delims= " %%i in ("%OS_VERSION%") do set OS_VERSION=%%i
+if defined OS_CAPTION for /f "tokens=* delims= " %%i in ("%OS_CAPTION%") do set "OS_CAPTION=%%i"
+if defined OS_VERSION for /f "tokens=* delims= " %%i in ("%OS_VERSION%") do set "OS_VERSION=%%i"
+
+REM Set default flavor
+set "OS_FLAVOR=windows"
 
 REM Determine OS flavor
-echo %OS_CAPTION% | findstr /i "Windows 11" >nul
-if %errorlevel%==0 (
-    set OS_FLAVOR=windows11
-) else (
+if defined OS_CAPTION (
+    echo %OS_CAPTION% | findstr /i "Windows 11" >nul
+    if not errorlevel 1 set "OS_FLAVOR=windows11"
+    
     echo %OS_CAPTION% | findstr /i "Windows 10" >nul
-    if %errorlevel%==0 (
-        set OS_FLAVOR=windows10
-    ) else (
-        echo %OS_CAPTION% | findstr /i "Server 2022" >nul
-        if %errorlevel%==0 (
-            set OS_FLAVOR=windowsserver2022
-        ) else (
-            echo %OS_CAPTION% | findstr /i "Server 2019" >nul
-            if %errorlevel%==0 (
-                set OS_FLAVOR=windowsserver2019
-            ) else (
-                set OS_FLAVOR=windows
-            )
-        )
-    )
+    if not errorlevel 1 set "OS_FLAVOR=windows10"
+    
+    echo %OS_CAPTION% | findstr /i "Server 2022" >nul
+    if not errorlevel 1 set "OS_FLAVOR=windowsserver2022"
+    
+    echo %OS_CAPTION% | findstr /i "Server 2019" >nul
+    if not errorlevel 1 set "OS_FLAVOR=windowsserver2019"
+    
+    echo %OS_CAPTION% | findstr /i "Server 2016" >nul
+    if not errorlevel 1 set "OS_FLAVOR=windowsserver2016"
 )
 
 REM Write environment variables to tmp-run-env.out