summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-04-04 21:34:41 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-04-04 21:34:41 (GMT)
commit6f1f9f8462368253b872e5eead179118c64cd866 (patch)
treebcd2428f930361b1cdc893609ef1ef460c7f5580 /Swift/Packaging
parent083c511d9861e06b1b7559936020a2fba04cb11c (diff)
downloadswift-contrib-6f1f9f8462368253b872e5eead179118c64cd866.zip
swift-contrib-6f1f9f8462368253b872e5eead179118c64cd866.tar.bz2
Don't prompt to install vcredist if already installed.
Resolves: #205
Diffstat (limited to 'Swift/Packaging')
-rw-r--r--Swift/Packaging/nsis/swift.nsi17
1 files changed, 11 insertions, 6 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index 862e841..171cb0c 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -83,12 +83,17 @@ sectionEnd
Section -Prerequisites
# http://nsis.sourceforge.net/Embedding_other_installers
- SetOutPath $INSTDIR\Prerequisites
- MessageBox MB_YESNO "Install C++ Runtime?" /SD IDYES IDNO endRuntime
- File ${msvccRedistributableDir}\${msvccRedistributableExe}
- ExecWait "$INSTDIR\Prerequisites\${msvccRedistributableExe}"
- Delete $INSTDIR\Prerequisites\${msvccRedistributableExe}
- RmDir $INSTDIR\Prerequisites
+ FindFirst $R1 $R0 "$WINDIR\winsxs\x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.492*"
+ ${If} $R0 != ""
+ #Skip vc runtime, already installed
+ ${Else}
+ SetOutPath $INSTDIR\Prerequisites
+ MessageBox MB_YESNO "Install C++ Runtime?" /SD IDYES IDNO endRuntime
+ File ${msvccRedistributableDir}\${msvccRedistributableExe}
+ ExecWait "$INSTDIR\Prerequisites\${msvccRedistributableExe}"
+ Delete $INSTDIR\Prerequisites\${msvccRedistributableExe}
+ RmDir $INSTDIR\Prerequisites
+ ${EndIf}
Goto endRuntime
endRuntime:
SectionEnd