From b7848d760f397f30101d45a9efb2428f7dc05da3 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 5 Dec 2013 17:48:55 +0800
Subject: [PATCH 1/4] Update to atom-shell v0.7.5.

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

diff --git a/package.json b/package.json
index a9635af38..1c1c82fb1 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.7.4",
+  "atomShellVersion": "0.7.5",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",

From a7db8229d53e916da288c0c84098093adb3482a8 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 5 Dec 2013 18:13:42 +0800
Subject: [PATCH 2/4] Also change the version field of package.json in
 set-development-version task.

---
 script/set-version                        |  2 +-
 tasks/set-development-version-task.coffee | 53 +++++++++++++----------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/script/set-version b/script/set-version
index 54376df1f..7cad26799 100755
--- a/script/set-version
+++ b/script/set-version
@@ -3,11 +3,11 @@
 set -e
 
 BUILT_PRODUCTS_DIR=$1
+VERSION=$2
 PLIST_PATH="$BUILT_PRODUCTS_DIR/Atom.app/Contents/Info.plist"
 HELPER_PLIST_PATH="$BUILT_PRODUCTS_DIR/Atom.app/Contents/Frameworks/Atom Helper.app/Contents/Info.plist"
 
 # Update version
-VERSION=$(git rev-parse --short HEAD | tr -d "\n")
 /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString $VERSION" "$PLIST_PATH"
 /usr/libexec/PlistBuddy -c "Set CFBundleVersion $VERSION" "$PLIST_PATH"
 /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString $VERSION" "$HELPER_PLIST_PATH"
diff --git a/tasks/set-development-version-task.coffee b/tasks/set-development-version-task.coffee
index 8a628fedf..66bdd1089 100644
--- a/tasks/set-development-version-task.coffee
+++ b/tasks/set-development-version-task.coffee
@@ -1,3 +1,4 @@
+fs = require 'fs'
 path = require 'path'
 
 module.exports = (grunt) ->
@@ -6,27 +7,35 @@ module.exports = (grunt) ->
   grunt.registerTask 'set-development-version', 'Sets version to current SHA-1', ->
     done = @async()
 
-    if process.platform is 'darwin'
-      cmd = 'script/set-version'
-      args = [grunt.config.get('atom.buildDir')]
-      spawn {cmd, args}, (error, result, code) -> done(error)
-    else if process.platform is 'win32'
-      shellAppDir = grunt.config.get('atom.shellAppDir')
-      shellExePath = path.join(shellAppDir, 'atom.exe')
+    cmd = 'git'
+    args = ['rev-parse', '--short', 'HEAD']
+    spawn {cmd, args}, (error, result, code) ->
+      return done(error) if error?
 
-      cmd = 'git'
-      args = ['rev-parse', '--short', 'HEAD']
-      spawn {cmd, args}, (error, result, code) ->
-        if error?
-          done(error)
-        else
-          version = result.stdout.trim()
-          strings =
-            CompanyName: 'GitHub, Inc.'
-            FileDescription: 'The hackable, collaborative editor of tomorrow!'
-            LegalCopyright: 'Copyright (C) 2013 GitHub, Inc. All rights reserved'
-            ProductName: 'Atom'
-            ProductVersion: version
+      version = result.stdout.trim()
+      appDir = grunt.config.get('atom.appDir')
 
-          rcedit = require('rcedit')
-          rcedit(shellExePath, {'version-string': strings}, done)
+      # Replace version field of package.json.
+      packageJsonPath = path.join(appDir, 'package.json')
+      packageJson = require(packageJsonPath)
+      packageJson.version = version
+      packageJsonString = JSON.stringify(packageJson, null, 2)
+      fs.writeFileSync(packageJsonPath, packageJsonString)
+
+      if process.platform is 'darwin'
+        cmd = 'script/set-version'
+        args = [grunt.config.get('atom.buildDir'), version]
+        spawn {cmd, args}, (error, result, code) -> done(error)
+      else if process.platform is 'win32'
+        shellAppDir = grunt.config.get('atom.shellAppDir')
+        shellExePath = path.join(shellAppDir, 'atom.exe')
+
+        strings =
+          CompanyName: 'GitHub, Inc.'
+          FileDescription: 'The hackable, collaborative editor of tomorrow!'
+          LegalCopyright: 'Copyright (C) 2013 GitHub, Inc. All rights reserved'
+          ProductName: 'Atom'
+          ProductVersion: version
+
+        rcedit = require('rcedit')
+        rcedit(shellExePath, {'version-string': strings}, done)

From 6c5669b53d6c9493f41d05695400423dce721377 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 5 Dec 2013 18:15:26 +0800
Subject: [PATCH 3/4] Add "productName" in package.json.

Atom-Shell would use it as application's name.
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 1c1c82fb1..bf546e721 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "atom",
+  "productName": "Atom",
   "version": "0.42.0",
   "main": "./src/browser/main.js",
   "repository": {

From 39fb5dc1340abf8735b0d78319759dce659c456e Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 9 Dec 2013 16:46:27 +0800
Subject: [PATCH 4/4] Update to atom-shell v0.7.6.

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

diff --git a/package.json b/package.json
index bf546e721..47d4f377e 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.7.5",
+  "atomShellVersion": "0.7.6",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/benogle/bootstrap.git",