diff --git a/build/package.json b/build/package.json index 4c0f460a7..308849a93 100644 --- a/build/package.json +++ b/build/package.json @@ -22,7 +22,7 @@ "grunt-contrib-less": "~0.8.0", "grunt-cson": "0.16.0", "grunt-download-electron": "^2.1.1", - "grunt-electron-installer": "1.0.5", + "grunt-electron-installer": "1.0.6", "grunt-lesslint": "0.17.0", "grunt-peg": "~1.1.0", "grunt-shell": "~0.3.1", diff --git a/build/tasks/publish-build-task.coffee b/build/tasks/publish-build-task.coffee index 53cd8aedb..d1640a42b 100644 --- a/build/tasks/publish-build-task.coffee +++ b/build/tasks/publish-build-task.coffee @@ -6,7 +6,6 @@ async = require 'async' fs = require 'fs-plus' GitHub = require 'github-releases' request = require 'request' -{convertVersion} = require 'grunt-electron-installer' grunt = null @@ -79,9 +78,8 @@ getAssets = -> {assetName: 'atom-api.json', sourcePath: 'atom-api.json'} ] when 'win32' - nupkgVersion = convertVersion(version) assets = [{assetName: 'atom-windows.zip', sourcePath: appName}] - for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{nupkgVersion}-full.nupkg", "atom-#{nupkgVersion}-delta.nupkg"] + for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"] cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset) assets.push({assetName: squirrelAsset, sourcePath: assetName}) assets diff --git a/src/browser/auto-update-manager.coffee b/src/browser/auto-update-manager.coffee index ca711eb83..55ab2462b 100644 --- a/src/browser/auto-update-manager.coffee +++ b/src/browser/auto-update-manager.coffee @@ -17,14 +17,8 @@ class AutoUpdateManager constructor: (@version, @testMode, @disabled) -> @state = IdleState - if process.platform is 'win32' - # Squirrel for Windows can't handle query params - # https://github.com/Squirrel/Squirrel.Windows/issues/132 - @feedUrl = 'https://atom.io/api/updates' - else - @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png') - @feedUrl = "https://atom.io/api/updates?version=#{@version}" - + @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png') + @feedUrl = "https://atom.io/api/updates?version=#{@version}" process.nextTick => @setupAutoUpdater() setupAutoUpdater: ->