Use new atom.cmd wrapper from installer

build/tasks/build-task.coffee

@@ -149,10 +149,8 @@ module.exports = (grunt) ->
           grunt.file.copy(sourcePath, path.resolve(appDir, '..', subDirectory, filename))
 
     if process.platform is 'win32'
-      # Set up chocolatey ignore and gui files
-      fs.writeFileSync path.join(appDir, 'apm', 'node_modules', 'atom-package-manager', 'bin', 'node.exe.ignore'), ''
-      fs.writeFileSync path.join(appDir, 'node_modules', 'symbols-view', 'vendor', 'ctags-win32.exe.ignore'), ''
-      fs.writeFileSync path.join(shellAppDir, 'atom.exe.gui'), ''
+      cp path.join('win', 'resources', 'atom.cmd'), path.join(shellAppDir, 'cli', 'atom.cmd')
+      cp path.join('win', 'resources', 'atom.js'), path.join(shellAppDir, 'cli', 'atom.js')
 
     dependencies = ['compile', 'generate-license:save', 'generate-module-cache', 'compile-packages-slug']
     dependencies.push('copy-info-plist') if process.platform is 'darwin'

resources/win/atom.cmd

@@ -1,20 +1,23 @@
 @echo off
 
-SET EXPECTOUTPUT=
+SET EXPECT_OUTPUT=
 
 FOR %%a IN (%*) DO (
-  IF /I "%%a"=="-h"           SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="--help"       SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="-v"           SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="--version"    SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="-f"           SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="--foreground" SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="-w"           SET EXPECTOUTPUT=YES
-  IF /I "%%a"=="--wait"       SET EXPECTOUTPUT=YES
+  IF /I "%%a"=="-h"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--help"       SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-v"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--version"    SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-f"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--foreground" SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="-w"           SET EXPECT_OUTPUT=YES
+  IF /I "%%a"=="--wait"       SET EXPECT_OUTPUT=YES
 )
 
-IF "%EXPECTOUTPUT%"=="YES" (
-  "C:\Users\kevin\AppData\Local\atom\app-0.156.0\atom.exe" %*
+SET ATOM_COMMAND="%~dp0\..\atom.exe"
+SET NODE_COMMAND="%~dp0\..\resources\app\apm\node_modules\atom-package-manager\bin\node.exe"
+
+IF "%EXPECT_OUTPUT%"=="YES" (
+  "%ATOM_COMMAND%" %*
 ) ELSE (
-  node "%~dp0\atom.js" "C:\Users\kevin\AppData\Local\atom\app-0.156.0\atom.exe" %* --executed-from=%CD%
+  "%NODE_COMMAND%" "%~dp0\atom.js" "%ATOM_COMMAND%" %* --executed-from=%CD%
 )

src/browser/squirrel-update.coffee

@@ -3,7 +3,8 @@ ChildProcess = require 'child_process'
 fs = require 'fs-plus'
 path = require 'path'
 
-rootAtomFolder = path.resolve(process.execPath, '..', '..')
+appFolder = path.resolve(process.execPath, '..')
+rootAtomFolder = path.resolve(appFolder, '..')
 binFolder = path.join(rootAtomFolder, 'bin')
 updateDotExe = path.join(rootAtomFolder, 'Update.exe')
 exeName = path.basename(process.execPath)
@@ -111,7 +112,7 @@ uninstallContextMenu = (callback) ->
 addCommandsToPath = (callback) ->
   installCommands = (callback) ->
     atomCommandPath = path.join(binFolder, 'atom.cmd')
-    relativeExePath = path.relative(binFolder, process.execPath)
+    relativeCmdPath = path.relative(binFolder, path.join(appFolder, 'cli', 'atom.cmd'))
     atomCommand = """
       @echo off
       "%~dp0\\#{relativeExePath}" %*