From db3bc289379840b466517abb0f16a8d2e349073f Mon Sep 17 00:00:00 2001
From: Patrick Detlefsen <patrick.detlefsen@gmail.com>
Date: Tue, 20 Oct 2015 19:25:03 +0200
Subject: [PATCH] PR feedback adressed

---
 atom/browser/api/lib/auto-updater.coffee            |  2 +-
 .../api/lib/auto-updater/auto-updater-win.coffee    | 13 +++----------
 .../api/lib/auto-updater/squirrel-update-win.coffee |  8 ++++----
 filenames.gypi                                      |  2 ++
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/atom/browser/api/lib/auto-updater.coffee b/atom/browser/api/lib/auto-updater.coffee
index a479f5fccf..c039bd12dc 100644
--- a/atom/browser/api/lib/auto-updater.coffee
+++ b/atom/browser/api/lib/auto-updater.coffee
@@ -1,6 +1,6 @@
 switch process.platform
   when 'win32'
-    autoUpdater = require('./auto-updater/auto-updater-win')
+    autoUpdater = require './auto-updater/auto-updater-win'
   else
     # take the default binding for the current platform
     autoUpdater  = process.atomBinding('auto_updater').autoUpdater
diff --git a/atom/browser/api/lib/auto-updater/auto-updater-win.coffee b/atom/browser/api/lib/auto-updater/auto-updater-win.coffee
index 9a2431577e..764f76a225 100644
--- a/atom/browser/api/lib/auto-updater/auto-updater-win.coffee
+++ b/atom/browser/api/lib/auto-updater/auto-updater-win.coffee
@@ -1,7 +1,7 @@
 {EventEmitter} = require 'events'
 SquirrelUpdate = require './auto-updater/squirrel-update-win'
-app            = require('app')
-url            = require('url')
+app            = require 'app'
+url            = require 'url'
 
 class AutoUpdater extends EventEmitter
 
@@ -12,14 +12,7 @@ class AutoUpdater extends EventEmitter
   setFeedUrl: (updateUrl) ->
     # set feed URL only when it hasn't been set before
     unless @updateUrl
-      # See https://github.com/Squirrel/Squirrel.Windows/issues/132
-      # 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)
+      @updateUrl = updateUrl
 
   checkForUpdates: ->
     throw new Error('Update URL is not set') unless @updateUrl
diff --git a/atom/browser/api/lib/auto-updater/squirrel-update-win.coffee b/atom/browser/api/lib/auto-updater/squirrel-update-win.coffee
index f07584f4c5..95d9e1465d 100644
--- a/atom/browser/api/lib/auto-updater/squirrel-update-win.coffee
+++ b/atom/browser/api/lib/auto-updater/squirrel-update-win.coffee
@@ -2,10 +2,10 @@ ChildProcess = require 'child_process'
 fs           = require 'fs'
 path         = require 'path'
 
-appFolder             = path.dirname(process.execPath) # i.e. my-app/app-0.1.13/
-rootApplicationFolder = path.resolve(appFolder, '..')  # i.e. my-app/
-updateDotExe          = path.join(rootApplicationFolder, 'Update.exe')
-exeName               = path.basename(process.execPath)
+appFolder             = path.dirname process.execPath # i.e. my-app/app-0.1.13/
+rootApplicationFolder = path.resolve appFolder, '..'  # i.e. my-app/
+updateDotExe          = path.join rootApplicationFolder, 'Update.exe'
+exeName               = path.basename process.execPath
 
 # Spawn a command and invoke the callback when it completes with an error
 # and the output from standard out.
diff --git a/filenames.gypi b/filenames.gypi
index ebd1fb41aa..35139dbdfc 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -11,6 +11,8 @@
       'atom/browser/api/lib/app.coffee',
       'atom/browser/api/lib/atom-delegate.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/content-tracing.coffee',
       'atom/browser/api/lib/dialog.coffee',