diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2013-02-13 22:30:55 -0500 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2013-02-13 22:30:55 -0500 |
| commit | 0ebd9e757aec4611589cdc88422a56f7cfe82663 (patch) | |
| tree | 24411281ff45f7b625b33eb834a758d34f167348 | |
| parent | b719383d2378f775252a482a1f1f81fc22d584cc (diff) | |
| download | pidgin-0ebd9e757aec4611589cdc88422a56f7cfe82663.tar.gz | |
installer: Fix CheckSHA1Sum restoring the stack - this was broken in 51473787ff4f.
* This ends up causing the downloaded file not to be extracted because the reference to the file is overwritten
* Also, fix the downloading to download to a file with a space in the path
| -rw-r--r-- | pidgin/win32/nsis/pidgin-installer.nsi | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi index 1545e12609..99acddb984 100644 --- a/pidgin/win32/nsis/pidgin-installer.nsi +++ b/pidgin/win32/nsis/pidgin-installer.nsi @@ -258,7 +258,7 @@ Section $(GTKSECTIONTITLE) SecGtk retry: StrCpy $R2 "${DOWNLOADER_URL}>k_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk" DetailPrint "Downloading GTK+ Runtime ... ($R2)" - NSISdl::download /TIMEOUT=10000 $R2 $R1 + NSISdl::download /TIMEOUT=10000 "$R2" "$R1" Pop $R0 ;StrCmp $R0 "cancel" done StrCmp $R0 "success" 0 prompt_retry @@ -453,7 +453,7 @@ Section /o $(DEBUGSYMBOLSSECTIONTITLE) SecDebugSymbols retry: StrCpy $R2 "${DOWNLOADER_URL}&dl_pkg=dbgsym" DetailPrint "Downloading Debug Symbols... ($R2)" - NSISdl::download /TIMEOUT=10000 $R2 $R1 + NSISdl::download /TIMEOUT=10000 "$R2" "$R1" Pop $R0 StrCmp $R0 "cancel" done StrCmp $R0 "success" 0 prompt_retry @@ -1331,9 +1331,11 @@ Function CheckSHA1Sum IntOp $R1 0 + 0 done: + Exch $R1 ;$R1 has the return code + Exch Pop $R2 + Exch Pop $R0 - Exch $R1 ;$R1 has the return code FunctionEnd !endif |