Skip to content

Commit

Permalink
Use browser selector over specific link macro.
Browse files Browse the repository at this point in the history
In lieu of broken update url from [#ifdef HAVE_64BIT_BUILD]
pre-processor macro not being executed, We are moving to a static
singular solution https://cyberfox.8pecxstudios.com/#selection
  • Loading branch information
InternalError503 committed Aug 20, 2016
1 parent 0caeef8 commit 91d60e0
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 25 deletions.
9 changes: 2 additions & 7 deletions browser/branding/official-amd/pref/firefox-branding.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ pref("startup.homepage_override_url","https://cyberfox.8pecxstudios.com/hooray-y
pref("startup.homepage_welcome_url","https://cyberfox.8pecxstudios.com/hooray-your-cyberfox-is-up-to-date?version=%VERSION%");
pref("startup.homepage_welcome_url.additional", "");

#ifdef HAVE_64BIT_BUILD
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com/cyberfox-amd-version-x64");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com/cyberfox-amd-version-x64");
#else
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com/cyberfox-amd-version-x86");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com/cyberfox-amd-version-x86");
#endif
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com#selection");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com#selection");

pref("app.update.check.url", "https://download.8pecxstudios.com/current_version/update.json");
// app.update.channel.type:
Expand Down
8 changes: 3 additions & 5 deletions browser/branding/official-beta/pref/firefox-branding.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#filter substitution

//Since the beta does not have a release notes page we will disable this.
pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
pref("startup.homepage_welcome_url.additional", "");

//We have no manual update url.
pref("app.update.url.manual", "");
pref("app.update.url.details", "");
//We have a manual update url.
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com#selection");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com#selection");

pref("app.update.check.url", "https://download.8pecxstudios.com/current_version/update.json");
// app.update.channel.type:
Expand Down
9 changes: 2 additions & 7 deletions browser/branding/official-intel/pref/firefox-branding.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ pref("startup.homepage_override_url","https://cyberfox.8pecxstudios.com/hooray-y
pref("startup.homepage_welcome_url","https://cyberfox.8pecxstudios.com/hooray-your-cyberfox-is-up-to-date?version=%VERSION%");
pref("startup.homepage_welcome_url.additional", "");

#ifdef HAVE_64BIT_BUILD
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com/cyberfox-intel-version-x64");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com/cyberfox-intel-version-x64");
#else
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com/cyberfox-intel-version-x86");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com/cyberfox-intel-version-x86");
#endif
pref("app.update.url.manual", "https://cyberfox.8pecxstudios.com#selection");
pref("app.update.url.details", "https://cyberfox.8pecxstudios.com#selection");

pref("app.update.check.url", "https://download.8pecxstudios.com/current_version/update.json");
// app.update.channel.type:
Expand Down
2 changes: 0 additions & 2 deletions browser/branding/official-linux-beta/pref/firefox-branding.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#filter substitution

//Since the beta does not have a release notes page we will disable this.
pref("startup.homepage_override_url","");
Expand Down
2 changes: 0 additions & 2 deletions browser/branding/official-linux/pref/firefox-branding.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#filter substitution

pref("startup.homepage_override_url","https://cyberfox.8pecxstudios.com/hooray-your-cyberfox-is-up-to-date?version=%VERSION%&oldversion=%OLD_VERSION%");
pref("startup.homepage_welcome_url","https://cyberfox.8pecxstudios.com/hooray-your-cyberfox-is-up-to-date?version=%VERSION%");
Expand Down
2 changes: 0 additions & 2 deletions browser/branding/unofficial/pref/firefox-branding.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#filter substitution

pref("startup.homepage_override_url","");
pref("startup.homepage_welcome_url","");
Expand Down

0 comments on commit 91d60e0

Please sign in to comment.