pidgin/android/libpurple

installer: Fix CheckSHA1Sum restoring the stack - this was broken in 51473787ff4f.
release-2.x.y
2013-02-13, Daniel Atallah
a8672a4a3a13
Parents 41d15beb309a
Children fb9baad00cbd
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
1 files changed, 5 insertions(+), 3 deletions(-)
  • +5 -3
    pidgin/win32/nsis/pidgin-installer.nsi
    • --- a/pidgin/win32/nsis/pidgin-installer.nsi Wed Feb 13 07:13:30 2013 -0800
    +++ b/pidgin/win32/nsis/pidgin-installer.nsi Wed Feb 13 22:30:55 2013 -0500
    @@ -258,7 +258,7 @@
    retry:
    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 @@
    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 @@
    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