Bug 1558090 - Support partner stub installers configuring the manual download URL. r=agashlin
authorMatt Howell <mhowell@mozilla.com>
Tue, 18 Jun 2019 23:39:21 +0000
changeset 479147 d4cb35f250617dfb8e018f77e4bc533426a09515
parent 479146 96b75db0403d0a060e5fe7518320e077896b3ea8
child 479148 bf1bc7abe7b6dd4a0539f494daafaf9434c03b84
push id36170
push usercbrindusan@mozilla.com
push dateWed, 19 Jun 2019 03:56:45 +0000
treeherdermozilla-central@5f0f37756053 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersagashlin
bugs1558090
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1558090 - Support partner stub installers configuring the manual download URL. r=agashlin I named the INI file parameter "FallbackPage" so that people building these configurations can quickly understand what this URL is for and don't have to figure out what "manual download" means. Differential Revision: https://phabricator.services.mozilla.com/D34359
browser/installer/windows/nsis/stub.nsi
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1897,17 +1897,23 @@ Function LaunchHelpPage
     Call OpenManualDownloadURL
   ${Else}
     GetFunctionAddress $0 OpenManualDownloadURL
     UAC::ExecCodeSegment $0
   ${EndIf}
 FunctionEnd
 
 Function OpenManualDownloadURL
-  ExecShell "open" "${URLManualDownload}${URLManualDownloadAppend}"
+  ClearErrors
+  ReadINIStr $0 "${PARTNER_INI}" "DownloadURL" "FallbackPage"
+  ${IfNot} ${Errors}
+    ExecShell "open" "$0"
+  ${Else}
+    ExecShell "open" "${URLManualDownload}${URLManualDownloadAppend}"
+  ${EndIf}
 FunctionEnd
 
 Function ShouldPromptForProfileCleanup
   ; This will be our return value.
   StrCpy $ProfileCleanupPromptType 0
 
   ; Only consider installations of the same architecture we're installing.
   ${If} $ArchToInstall == ${ARCH_AMD64}