/pidgin/main: a8672a4a3a13: installer: Fix CheckSHA1Sum restorin...

Daniel Atallah datallah at pidgin.im
Wed Feb 13 22:32:12 EST 2013

Changeset: a8672a4a3a13eae50dcb7ac9e22cecd01a3816c6
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-02-13 22:30 -0500
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/a8672a4a3a13


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


 pidgin/win32/nsis/pidgin-installer.nsi |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (34 lines):

diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -258,7 +258,7 @@ Section $(GTKSECTIONTITLE) SecGtk
   StrCpy $R2 "${DOWNLOADER_URL}&gtk_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) S
   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
+  Exch $R1 ;$R1 has the return code
+  Exch
   Pop $R2
+  Exch
   Pop $R0
-  Exch $R1 ;$R1 has the return code

More information about the Commits mailing list