pidgin/pidgin

Port the debug symbol download to the inetc plugin
release-2.x.y
7 months ago, Gary Kramlich
9cc9fac6dd3c
Parents 2ff89178eb3d
Children 288a5b3e994f
Port the debug symbol download to the inetc plugin

Testing Done:
This patch is built on top of the v2.14.3 tag so that it could properly be tested by running the installer.

Reviewed at https://reviews.imfreedom.org/r/627/
--- a/pidgin/win32/nsis/pidgin-installer.nsi Mon Apr 19 20:41:12 2021 -0500
+++ b/pidgin/win32/nsis/pidgin-installer.nsi Sun Apr 25 00:28:39 2021 -0500
@@ -257,7 +257,7 @@
retry:
StrCpy $R2 "${DOWNLOADER_URL}&gtk_version=${GTK_INSTALL_VERSION}&dl_pkg=gtk"
DetailPrint "Downloading GTK+ Runtime ... ($R2)"
- inetc::get /TIMEOUT=10000 "$R2" "$R1"
+ inetc::get /CONNECTTIMEOUT=10 "$R2" "$R1"
Pop $R0
StrCmp $R0 "OK" 0 prompt_retry
@@ -435,10 +435,10 @@
retry:
StrCpy $R2 "${DOWNLOADER_URL}&dl_pkg=dbgsym"
DetailPrint "Downloading Debug Symbols... ($R2)"
- NSISdl::download /TIMEOUT=10000 "$R2" "$R1"
+ inetc::get /CONNECTTIMEOUT=10 "$R2" "$R1"
Pop $R0
- StrCmp $R0 "cancel" done
- StrCmp $R0 "success" 0 prompt_retry
+ StrCmp $R0 "Cancelled" done
+ StrCmp $R0 "OK" 0 prompt_retry
Push "${DEBUG_SYMBOLS_SHA1SUM}"
Push "$R1" ; Filename