Skip to content
Snippets Groups Projects
Commit a04ad990 authored by Tank_Master's avatar Tank_Master
Browse files

Open-154 Better service pack detection for Vista and Server 2008

parent b6708435
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/installers/windows/installer_template.nsi
+ 20
− 8
View file @ a04ad990
...@@ -189,20 +189,32 @@ FunctionEnd ...@@ -189,20 +189,32 @@ FunctionEnd
;Recommend Upgrading Service Pack ;Recommend Upgrading Service Pack
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function CheckWindowsServPack Function CheckWindowsServPack
${If} ${IsWinXP} ${If} ${IsWinVista}
${AndIfNot} ${IsServicePack} 3
${OrIf} ${IsWin2003}
${AndIfNot} ${IsServicePack} 2
${OrIf} ${IsWinVista}
${AndIfNot} ${IsServicePack} 2 ${AndIfNot} ${IsServicePack} 2
${OrIf} ${IsWin2008} MessageBox MB_OK $(CheckWindowsServPackMB)
DetailPrint $(UseLatestServPackDP)
Return
${EndIf}
${If} ${IsWin2008}
${AndIfNot} ${IsServicePack} 2 ${AndIfNot} ${IsServicePack} 2
${OrIf} ${IsWin7} MessageBox MB_OK $(CheckWindowsServPackMB)
DetailPrint $(UseLatestServPackDP)
Return
${EndIf}
${If} ${IsWin7}
${AndIfNot} ${IsServicePack} 1 ${AndIfNot} ${IsServicePack} 1
${OrIf} ${IsWin2008R2} MessageBox MB_OK $(CheckWindowsServPackMB)
DetailPrint $(UseLatestServPackDP)
Return
${EndIf}
${If} ${IsWin2008R2}
${AndIfNot} ${IsServicePack} 1 ${AndIfNot} ${IsServicePack} 1
MessageBox MB_OK $(CheckWindowsServPackMB) MessageBox MB_OK $(CheckWindowsServPackMB)
DetailPrint $(UseLatestServPackDP) DetailPrint $(UseLatestServPackDP)
Return
${EndIf} ${EndIf}
FunctionEnd FunctionEnd
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment