mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

PR feedback adressed

Browse source
This commit is contained in:
Patrick Detlefsen 2015-10-20 19:25:03 +02:00
parent 6c4016af46
commit db3bc28937
4 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/lib/auto-updater.coffee
View file

@ -1,6 +1,6 @@
switch process.platform switch process.platform
when 'win32' when 'win32'
autoUpdater = require('./auto-updater/auto-updater-win') autoUpdater = require './auto-updater/auto-updater-win'
else else
# take the default binding for the current platform # take the default binding for the current platform
autoUpdater = process.atomBinding('auto_updater').autoUpdater autoUpdater = process.atomBinding('auto_updater').autoUpdater

13
atom/browser/api/lib/auto-updater/auto-updater-win.coffee
View file

@ -1,7 +1,7 @@
{EventEmitter} = require 'events' {EventEmitter} = require 'events'
SquirrelUpdate = require './auto-updater/squirrel-update-win' SquirrelUpdate = require './auto-updater/squirrel-update-win'
app = require('app') app = require 'app'
url = require('url') url = require 'url'
class AutoUpdater extends EventEmitter class AutoUpdater extends EventEmitter
@ -12,14 +12,7 @@ class AutoUpdater extends EventEmitter
setFeedUrl: (updateUrl) -> setFeedUrl: (updateUrl) ->
# set feed URL only when it hasn't been set before # set feed URL only when it hasn't been set before
unless @updateUrl unless @updateUrl
# See https://github.com/Squirrel/Squirrel.Windows/issues/132 @updateUrl = updateUrl
# This way the Mac and Windows Update URL can be the same, even when
# the Mac version is sending additional data in the query string.
parsedUrl = url.parse(updateUrl)
delete parsedUrl.search
delete parsedUrl.query
@updateUrl = url.format(parsedUrl)
checkForUpdates: -> checkForUpdates: ->
throw new Error('Update URL is not set') unless @updateUrl throw new Error('Update URL is not set') unless @updateUrl

8
atom/browser/api/lib/auto-updater/squirrel-update-win.coffee
View file

@ -2,10 +2,10 @@ ChildProcess = require 'child_process'
fs = require 'fs' fs = require 'fs'
path = require 'path' path = require 'path'
appFolder = path.dirname(process.execPath) # i.e. my-app/app-0.1.13/ appFolder = path.dirname process.execPath # i.e. my-app/app-0.1.13/
rootApplicationFolder = path.resolve(appFolder, '..') # i.e. my-app/ rootApplicationFolder = path.resolve appFolder, '..' # i.e. my-app/
updateDotExe = path.join(rootApplicationFolder, 'Update.exe') updateDotExe = path.join rootApplicationFolder, 'Update.exe'
exeName = path.basename(process.execPath) exeName = path.basename process.execPath
# Spawn a command and invoke the callback when it completes with an error # Spawn a command and invoke the callback when it completes with an error
# and the output from standard out. # and the output from standard out.

2
filenames.gypi
View file

@ -11,6 +11,8 @@
'atom/browser/api/lib/app.coffee', 'atom/browser/api/lib/app.coffee',
'atom/browser/api/lib/atom-delegate.coffee', 'atom/browser/api/lib/atom-delegate.coffee',
'atom/browser/api/lib/auto-updater.coffee', 'atom/browser/api/lib/auto-updater.coffee',
'atom/browser/api/lib/auto-updater/auto-updater-win.coffee',
'atom/browser/api/lib/auto-updater/squirrel-update-win.coffee',
'atom/browser/api/lib/browser-window.coffee', 'atom/browser/api/lib/browser-window.coffee',
'atom/browser/api/lib/content-tracing.coffee', 'atom/browser/api/lib/content-tracing.coffee',
'atom/browser/api/lib/dialog.coffee', 'atom/browser/api/lib/dialog.coffee',