adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch Win32 Installer download plugin to InetC, which supports redirection and HTTPS

Browse Source
This commit is contained in:
Michael Martin
2020-06-07 22:42:53 -07:00
parent d795e55fc4
commit 32c0b4875a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/win32_install/uqm-installer.nsi
+10 -9
View File
@@ -161,12 +161,13 @@ ZipPackageOK:
CopyFiles "$PACKAGEDIR\$1.zip" "$0\$1" CopyFiles "$PACKAGEDIR\$1.zip" "$0\$1"
Goto PackageDone Goto PackageDone
AttemptDownload: AttemptDownload:
# We'll run an InetC-based download here, which should automatically GetTempFileName $DOWNLOADTARGET
# handle redirection, mirrors, https, and the rest for us. Delete $DOWNLOADTARGET
# GetTempFileName $DOWNLOADTARGET CreateDirectory $DOWNLOADTARGET
# Delete $DOWNLOADTARGET inetc::get "https://downloads.sourceforge.net/project/sc2/$DOWNLOADPATH$1" "$DOWNLOADTARGET/$1" /END
# CreateDirectory $DOWNLOADTARGET Pop $2
StrCpy $2 "Download functionality has been disabled in this build" StrCmp $2 "OK" DownloadSuccessful
StrCmp $2 "Cancelled" DownloadCanceled
StrCpy $2 "Could not install the package $1 due to the following error: $\"$2$\"." StrCpy $2 "Could not install the package $1 due to the following error: $\"$2$\"."
Goto CheckMandatory Goto CheckMandatory
DownloadCanceled: DownloadCanceled:
@@ -284,7 +285,7 @@ SectionGroup "!UQM" SECGRP01
StrCpy $MANDATORY 1 StrCpy $MANDATORY 1
StrCpy $MD5SUM "${PKG_CONTENT_MD5SUM}" StrCpy $MD5SUM "${PKG_CONTENT_MD5SUM}"
File "..\..\content\version" File "..\..\content\version"
StrCpy $DOWNLOADPATH "UQM/0.7/" StrCpy $DOWNLOADPATH "UQM/0.8/"
Push "${PKG_CONTENT_FILE}" Push "${PKG_CONTENT_FILE}"
Push "$INSTDIR\content\packages" Push "$INSTDIR\content\packages"
Call HandlePackage Call HandlePackage
@@ -306,7 +307,7 @@ SectionGroup /e "3DO Content" SECGRP02
AddSize ${PKG_3DOMUSIC_SIZE} AddSize ${PKG_3DOMUSIC_SIZE}
StrCpy $MANDATORY 0 StrCpy $MANDATORY 0
StrCpy $MD5SUM "${PKG_3DOMUSIC_MD5SUM}" StrCpy $MD5SUM "${PKG_3DOMUSIC_MD5SUM}"
StrCpy $DOWNLOADPATH "UQM/0.7/" StrCpy $DOWNLOADPATH "UQM/0.8/"
Push "${PKG_3DOMUSIC_FILE}" Push "${PKG_3DOMUSIC_FILE}"
Push "$INSTDIR\content\addons" Push "$INSTDIR\content\addons"
Call HandlePackage Call HandlePackage
@@ -320,7 +321,7 @@ SectionGroup /e "3DO Content" SECGRP02
AddSize ${PKG_VOICE_SIZE} AddSize ${PKG_VOICE_SIZE}
StrCpy $MANDATORY 0 StrCpy $MANDATORY 0
StrCpy $MD5SUM "${PKG_VOICE_MD5SUM}" StrCpy $MD5SUM "${PKG_VOICE_MD5SUM}"
StrCpy $DOWNLOADPATH "UQM/0.7/" StrCpy $DOWNLOADPATH "UQM/0.8/"
Push "${PKG_VOICE_FILE}" Push "${PKG_VOICE_FILE}"
Push "$INSTDIR\content\addons" Push "$INSTDIR\content\addons"
Call HandlePackage Call HandlePackage