From 53b516a6ec21b7f7e26b4577e1e3fd1759520eb5 Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Mon, 18 Apr 2016 20:48:34 -0700
Subject: [PATCH 1/4] Quote spaces in paths on Win cmd line

---
 resources/win/atom.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd
index a1af5cd53..8a4fed05c 100644
--- a/resources/win/atom.cmd
+++ b/resources/win/atom.cmd
@@ -2,6 +2,7 @@
 
 SET EXPECT_OUTPUT=
 SET WAIT=
+SET PSARGS=%*
 
 FOR %%a IN (%*) DO (
   IF /I "%%a"=="-f"           SET EXPECT_OUTPUT=YES
@@ -25,7 +26,7 @@ FOR %%a IN (%*) DO (
 IF "%EXPECT_OUTPUT%"=="YES" (
   SET ELECTRON_ENABLE_LOGGING=YES
   IF "%WAIT%"=="YES" (
-    powershell -noexit "%~dp0\..\..\atom.exe" --pid=$pid %* ; wait-event
+    powershell -noexit "Start-Process -FilePath \"%~dp0\..\..\atom.exe\" -ArgumentList \"--pid=$pid $env:PSARGS\" ; wait-event"
   ) ELSE (
     "%~dp0\..\..\atom.exe" %*
   )

From 9ff5fb21fb0cccea293e43a36d3c04edd989df6c Mon Sep 17 00:00:00 2001
From: Wliu <50Wliu@users.noreply.github.com>
Date: Wed, 20 Apr 2016 07:30:34 -0400
Subject: [PATCH 2/4] :arrow_up: language-make@0.22.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8fbc557d4..0cd63e918 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "language-javascript": "0.110.0",
     "language-json": "0.18.0",
     "language-less": "0.29.3",
-    "language-make": "0.21.1",
+    "language-make": "0.22.0",
     "language-mustache": "0.13.0",
     "language-objective-c": "0.15.1",
     "language-perl": "0.34.0",

From 196bc53e6bef729c4925e0ae3789c3360def8dfd Mon Sep 17 00:00:00 2001
From: Damien Guard <damieng@gmail.com>
Date: Wed, 20 Apr 2016 09:57:41 -0700
Subject: [PATCH 3/4] Ensure Windows Bash script works on all versions

---
 resources/win/atom.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/win/atom.sh b/resources/win/atom.sh
index 7380bf122..cd90ff8fb 100644
--- a/resources/win/atom.sh
+++ b/resources/win/atom.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
-$(dirname "$0")/atom.cmd "$@"
+pushd $(dirname "$0") > /dev/null
+ATOMCMD=""$(pwd -W)"/atom.cmd"
+popd > /dev/null
+cmd.exe //c "$ATOMCMD" "$@"

From eb739cd025b7914b97a1476e1140f6866563c0b6 Mon Sep 17 00:00:00 2001
From: Katrina Uychaco <kuychaco@github.com>
Date: Wed, 20 Apr 2016 12:40:45 -0700
Subject: [PATCH 4/4] Add `build-and-sign` grunt task for codesigning Atom

---
 build/Gruntfile.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index f8ee607e5..73279779c 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -298,6 +298,7 @@ module.exports = (grunt) ->
   unless process.platform is 'linux' or grunt.option('no-install')
     defaultTasks.push 'install'
   grunt.registerTask('default', defaultTasks)
+  grunt.registerTask('build-and-sign', ['download-electron', 'download-electron-chromedriver', 'build', 'set-version', 'generate-asar', 'codesign:app', 'install'])
 
 getDefaultChannelAndReleaseBranch = (version) ->
   if version.match(/dev/) or isBuildingPR()