Merge pull request boxcutter#54 from dusek/wmic

Detect OS version correctly on non-English Windows fixes boxcutter#45
fokk · Nov 29, 2015 · e365ae9 · e365ae9
2 parents 3ea655b + 28c1994
commit e365ae9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/floppy/cygwin.bat b/floppy/cygwin.bat
@@ -9,7 +9,7 @@ if not defined CYGWIN_ARCH (
   set CYGWIN_ARCH=x86
 
   :: Force CYGWIN_ARCH to 64-bit - 32-bit seems to crash a lot on Windows 2008 and 2012
-  systeminfo 2>nul  | findstr /b /c:"OS Name" | findstr "2008 2012" >nul
+  wmic os get Caption | findstr "2008 2012" >nul
   if not errorlevel 1 set CYGWIN_ARCH=x86_64
 )
 

diff --git a/floppy/install-winrm.cmd b/floppy/install-winrm.cmd
@@ -21,7 +21,7 @@ if exist %SystemRoot%\SysWOW64\cmd.exe (
   @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force" <NUL
 )
 
-systeminfo 2>nul | findstr /b /c:"OS Name" | findstr /c:"Windows 7" /c:"Windows 10" >nul
+wmic os get Caption | findstr /c:"Windows 7" /c:"Windows 10" >nul
 if errorlevel 1 goto skip_fixnetwork
 
 if not exist a:\fixnetwork.ps1 echo ==^> ERROR: File not found: a:\fixnetwork.ps1