codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-26 03:09:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[#2777] Update MSVC SP1 check to latest release CLID

Browse Source
This commit is contained in:
Calum Lind 2015-11-15 18:37:42 +00:00
parent a58ce30e7b
commit 5464cf674a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
win32/deluge-win32-installer.nsi
View File

@ -122,8 +122,7 @@ Function finishpageaction
CreateShortCut "$DESKTOP\Deluge.lnk" "$INSTDIR\deluge.exe" CreateShortCut "$DESKTOP\Deluge.lnk" "$INSTDIR\deluge.exe"
FunctionEnd FunctionEnd
#Test if Visual Studio Redistributables 2008 SP1 installed # Test if Visual Studio Redistributables 2008 SP1 installed and returns -1 if none installed
#Returns -1 if there is no VC redistributables intstalled
Function CheckVCRedist2008 Function CheckVCRedist2008
Push $R0 Push $R0
ClearErrors ClearErrors
@ -133,7 +132,7 @@ Function CheckVCRedist2008
Push $R1 Push $R1
ClearErrors ClearErrors
ReadRegDword $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}" "Version" ReadRegDword $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9BE518E6-ECC6-35A9-88E4-87755C07200F}" "Version"
IfErrors 0 VSRedistInstalled IfErrors 0 VSRedistInstalled
StrCpy $R1 "-1" StrCpy $R1 "-1"
@ -152,13 +151,13 @@ Function VCRedistMessage
Call CheckVCRedist2008 Call CheckVCRedist2008
Pop $R0 Pop $R0
StrCmp $R0 "-1" 0 end StrCmp $R0 "-1" 0 end
MessageBox MB_YESNO|MB_ICONEXCLAMATION "The following package is required to run \ MessageBox MB_YESNO|MB_ICONEXCLAMATION "Deluge requires an MSVC package to run \
Deluge but it does not appear to be installed:$\r$\n$\r$\n\ but the recommended package does not appear to be installed:$\r$\n$\r$\n\
Microsoft Visual C++ 2008 SP1 Redistributable Package (x86)$\r$\n$\r$\n\ Microsoft Visual C++ 2008 SP1 Redistributable Package (x86)$\r$\n$\r$\n\
Would you like to download it now?" /SD IDNO IDYES clickyes Would you like to download it now?" /SD IDNO IDYES clickyes
Goto end Goto end
clickyes: clickyes:
ExecShell open "https://www.microsoft.com/en-us/download/details.aspx?id=5582" ExecShell open "https://www.microsoft.com/en-us/download/details.aspx?id=26368"
end: end:
FunctionEnd FunctionEnd