From 12b02448d86d1cf255eca4262bf93cf40c6cb592 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Tue, 25 Sep 2018 14:28:02 -0700 Subject: [PATCH] Enable ATOM_UPDATE_URL_PREFIX env var to override update server URL --- script/lib/create-windows-installer.js | 3 ++- src/main-process/auto-update-manager.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/script/lib/create-windows-installer.js b/script/lib/create-windows-installer.js index f5e387e7f..60340562a 100644 --- a/script/lib/create-windows-installer.js +++ b/script/lib/create-windows-installer.js @@ -9,6 +9,7 @@ const CONFIG = require('../config') module.exports = (packagedAppPath) => { const archSuffix = process.arch === 'ia32' ? '' : '-' + process.arch + const updateUrlPrefix = process.env.ATOM_UPDATE_URL_PREFIX || 'https://atom.io' const options = { appDirectory: packagedAppPath, authors: 'GitHub Inc.', @@ -17,7 +18,7 @@ module.exports = (packagedAppPath) => { outputDirectory: CONFIG.buildOutputPath, noMsi: true, noDelta: CONFIG.channel === 'nightly', // Delta packages are broken for nightly versions past nightly9 due to Squirrel/NuGet limitations - remoteReleases: `https://atom.io/api/updates${archSuffix}?version=${CONFIG.computedAppVersion}`, + remoteReleases: `${updateUrlPrefix}/api/updates${archSuffix}?version=${CONFIG.computedAppVersion}`, setupExe: `AtomSetup${process.arch === 'x64' ? '-x64' : ''}.exe`, setupIcon: path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'atom.ico') } diff --git a/src/main-process/auto-update-manager.js b/src/main-process/auto-update-manager.js index d9082b6c5..bed2e6c2d 100644 --- a/src/main-process/auto-update-manager.js +++ b/src/main-process/auto-update-manager.js @@ -22,15 +22,16 @@ class AutoUpdateManager extends EventEmitter { this.config = config this.state = IdleState this.iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png') + this.updateUrlPrefix = process.env.ATOM_UPDATE_URL_PREFIX || 'https://atom.io' } initialize () { if (process.platform === 'win32') { const archSuffix = process.arch === 'ia32' ? '' : `-${process.arch}` - this.feedUrl = `https://atom.io/api/updates${archSuffix}?version=${this.version}` + this.feedUrl = `${this.updateUrlPrefix}/api/updates${archSuffix}?version=${this.version}` autoUpdater = require('./auto-updater-win32') } else { - this.feedUrl = `https://atom.io/api/updates?version=${this.version}`; + this.feedUrl = `${this.updateUrlPrefix}/api/updates?version=${this.version}`; ({autoUpdater} = require('electron')) }