fix(windows): Windows build changes

build/Gruntfile.coffee

@@ -262,7 +262,7 @@ module.exports = (grunt) ->
       authors: 'InboxApp Inc.'
       loadingGif: path.resolve(__dirname, '..', 'resources', 'win', 'loading.gif')
       iconUrl: 'https://raw.githubusercontent.com/atom/atom/master/resources/win/atom.ico'
-      setupIcon: path.resolve(__dirname, '..', 'resources', 'win', 'atom.ico')
+      setupIcon: path.resolve(__dirname, '..', 'resources', 'win', 'edgehill.ico')
 
     shell:
       'kill-atom':
@@ -281,10 +281,10 @@ module.exports = (grunt) ->
   ciTasks.push('dump-symbols') if process.platform isnt 'win32'
   ciTasks.push('set-version', 'lint')
   ciTasks.push('mkdeb') if process.platform is 'linux'
-  ciTasks.push('create-windows-installer') if process.platform is 'win32'
   ciTasks.push('test') if process.platform is 'darwin'
   ciTasks.push('codesign')
   ciTasks.push('mkdmg') if process.platform is 'darwin'
+  ciTasks.push('create-windows-installer') if process.platform is 'win32'
   ciTasks.push('publish-edgehill-build') if process.platform is 'darwin'
   # ciTasks.push('publish-build')
   grunt.registerTask('ci', ciTasks)

build/tasks/build-task.coffee

@@ -21,6 +21,11 @@ module.exports = (grunt) ->
       cp(path.join(shellAppDir, 'Contents', 'MacOS', 'Atom'),
          path.join(shellAppDir, 'Contents', 'MacOS', 'Edgehill'))
       rm path.join(shellAppDir, 'Contents', 'MacOS', 'Atom')
+    else if process.platform is 'win32'
+      cp 'atom-shell', shellAppDir, filter: /default_app/
+      # We can rename atom.exe to edgehill.exe, but all of the node libraries with
+      # native code are hard-linked to a file called atom.exe. For now, let's just
+      # leave it as atom.exe. https://github.com/atom/atom-shell/issues/713
     else
       cp 'atom-shell', shellAppDir, filter: /default_app/
       cp path.join(shellAppDir, 'atom'), path.join(shellAppDir, 'edgehill')

build/tasks/codesign-task.coffee

@@ -41,16 +41,19 @@ module.exports = (grunt) ->
         args = ['--deep', '--force', '--verbose', '--sign', 'Developer ID Application: InboxApp, Inc.', grunt.config.get('atom.shellAppDir')]
         spawn {cmd, args}, (error) -> callback(error)
       when 'win32'
-        spawn {cmd: 'taskkill', args: ['/F', '/IM', 'edgehill.exe']}, ->
+        # TODO: Don't do anything now, because we need a certificate pfx file
+        # issued from a certificate authority, and we don't have one.
+        return callback()
+        spawn {cmd: 'taskkill', args: ['/F', '/IM', 'atom.exe']}, ->
           cmd = process.env.JANKY_SIGNTOOL ? 'signtool'
-          args = [path.join(grunt.config.get('atom.shellAppDir'), 'edgehill.exe')]
+          args = ['sign', path.join(grunt.config.get('atom.shellAppDir'), 'atom.exe')]
 
           spawn {cmd, args}, (error) ->
             return callback(error) if error?
 
             setupExePath = path.resolve(grunt.config.get('atom.buildDir'), 'installer', 'AtomSetup.exe')
             if fs.isFileSync(setupExePath)
-              args = [setupExePath]
+              args = ['sign', setupExePath]
               spawn {cmd, args}, (error) -> callback(error)
             else
               callback()

internal_packages/account-sidebar/lib/account-sidebar-store.coffee

@@ -55,8 +55,8 @@ AccountSidebarStore = Reflux.createStore
     namespace = NamespaceStore.current()
     return unless namespace
 
-    @_sections.forEach (section) =>
-      section.tags.forEach (tag) =>
+    @_sections.forEach (section) ->
+      section.tags.forEach (tag) ->
         # Some tags don't have unread counts
         return if tag.id in ['archive', 'drafts', 'sent', 'trash']
 

package.json

@@ -84,7 +84,6 @@
   },
   "private": true,
   "scripts": {
-    "preinstall": "node -e 'process.exit(0)'",
-    "postinstall": "(cd internal_packages/composer; npm install)"
+    "preinstall": "node -e 'process.exit(0)'"
   }
 }

script/bootstrap

@@ -124,7 +124,7 @@ function bootstrap() {
       options: semverOptions
     },
     {
-      command: 'build/node_modules/.bin/grunt download-atom-shell --gruntfile build/Gruntfile.coffee',
+      command: 'grunt download-atom-shell --gruntfile ./build/Gruntfile.coffee',
       message: m7
     }
   ];

src/flux/inbox-api.coffee

@@ -83,7 +83,7 @@ class InboxAPI
         ## TODO use OfflineStatusStore
         Actions.longPollOffline()
 
-    connection.onDeltas (deltas) =>
+    connection.onDeltas (deltas) ->
       # TODO DO NOT FORGET TO UNCOMMENT ME
       # @_handleDeltas(deltas)