Improve edition package detection
							parent
							
								
									4e702068be
								
							
						
					
					
						commit
						1bdee1ce6f
					
				| 
						 | 
					@ -1676,10 +1676,12 @@ call :dk_color %Red% "Checking License Files                  [Not Found] [%osed
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
				
			||||||
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-%osedition%Edition*.mum" (
 | 
				
			||||||
call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
					call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
					if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1379,10 +1379,12 @@ call :dk_color %Red% "Checking License Files                  [Not Found] [%osed
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
				
			||||||
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-%osedition%Edition*.mum" (
 | 
				
			||||||
call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
					call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
					if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1522,10 +1522,12 @@ call :dk_color %Red% "Checking License Files                  [Not Found] [%osed
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
				
			||||||
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-%osedition%Edition*.mum" (
 | 
				
			||||||
call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
					call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
					if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2040,10 +2040,12 @@ call :dk_color %Red% "Checking License Files                  [Not Found] [%osed
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
				
			||||||
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-%osedition%Edition*.mum" (
 | 
				
			||||||
call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
					call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
					if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3092,10 +3092,12 @@ call :dk_color %Red% "Checking License Files                  [Not Found] [%osed
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
				
			||||||
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-%osedition%Edition*.mum" (
 | 
				
			||||||
call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
					call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
					if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2706,10 +2706,13 @@ call :dk_color %Red% "Checking License Files                  [Not Found] [%osed
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-*-%osedition%-*.mum" (
 | 
				
			||||||
 | 
					if not exist "%SystemRoot%\Servicing\Packages\Microsoft-Windows-%osedition%Edition*.mum" (
 | 
				
			||||||
call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
					call :dk_color %Red% "Checking Package Files                  [Not Found] [%osedition%]"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
					if %_wmic% EQU 1 wmic path %sps% get Version %nul%
 | 
				
			||||||
if %_wmic% EQU 0 %psc% "try { $null=([WMISEARCHER]'SELECT * FROM %sps%').Get().Version; exit 0 } catch { exit $_.Exception.InnerException.HResult }" %nul%
 | 
					if %_wmic% EQU 0 %psc% "try { $null=([WMISEARCHER]'SELECT * FROM %sps%').Get().Version; exit 0 } catch { exit $_.Exception.InnerException.HResult }" %nul%
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue