Resolve path to apm

Refs #1936

CONTRIBUTING.md

@@ -30,7 +30,7 @@ in the proper package's repository.
   * Follow the [CoffeeScript](#coffeescript-styleguide),
     [JavaScript](https://github.com/styleguide/javascript),
     and [CSS](https://github.com/styleguide/css) styleguides
-  * Include thoughtfully worded [Jasmine](http://pivotal.github.com/jasmine)
+  * Include thoughtfully worded [Jasmine](http://jasmine.github.io/)
     specs
   * Avoid placing files in `vendor`. 3rd-party packages should be added as a
     `package.json` dependency.
@@ -52,11 +52,11 @@ in the proper package's repository.
   * Use the present tense
   * Reference issues and pull requests liberally
   * Consider starting the commit message with an applicable emoji:
-    * :lipstick: when improving the format/structure of the code
-    * :racehorse: when improving performance
-    * :non-potable_water: when plugging memory leaks
-    * :memo: when writing docs
-    * :penguin: when fixing something on Linux
+    * :lipstick: `:lipstick:` when improving the format/structure of the code
+    * :racehorse: `:racehorse:` when improving performance
+    * :non-potable_water: `:non-potable_water:` when plugging memory leaks
+    * :memo: `:memo:` when writing docs
+    * :penguin: `:penguin:` when fixing something on Linux
 
 ## CoffeeScript Styleguide
 

README.md

@@ -8,8 +8,7 @@ Atom is designed to be customizable, but also usable without needing to edit a c
 
 Atom is modern, approachable, and hackable to the core.
 
-Visit [atom.io](http://atom.io)
-to learn more.
+Visit [atom.io](http://atom.io) to learn more.
 
 ## Installing
 
@@ -19,11 +18,45 @@ Atom will automatically update when a new release is available.
 
 ## Building
 
-```sh
-git clone git@github.com:atom/atom.git
-cd atom
-script/build # Creates application at /Applications/Atom.app
-```
+
+**OS X Requirements**
+  * OS X 10.8 or later
+  * [node.js](http://nodejs.org/)
+  * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (Run `xcode-select --install`)
+
+  ```sh
+  git clone https://github.com/atom/atom
+  cd atom
+  script/build # Creates application at /Applications/Atom.app
+  ```
+
+**Linux Requirements**
+  * Ubuntu LTS 12.04 64-bit is the recommended platform
+  * [node.js](http://nodejs.org/)
+  * `sudo apt-get install libgnome-keyring-dev`
+
+  ```sh
+  git clone https://github.com/atom/atom
+  cd atom
+  script/build # Creates application at /tmp/atom-build/Atom
+  sudo script/grunt install # Installs command to /usr/local/bin/atom
+  ```
+
+**Windows Requirements**
+  * Windows 7 or later
+  * [Visual C++ 2010 Express](http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express)
+  * [node.js - 32bit](http://nodejs.org/)
+  * [Python 2.7.x](http://www.python.org/download/)
+  * [GitHub for Windows](http://windows.github.com/)
+  * Clone [atom/atom](https://github.com/atom/atom/) to `C:\Users\<user>\github\atom\`
+  * Add `C:\Python27;C:\Program Files\nodejs;C:\Users\<user>\github\atom\node_modules\`
+    to your PATH
+  * Open the Windows GitHub shell
+
+  ```bat
+  cd C:\Users\<user>\github\atom
+  script/build
+  ```
 
 ## Developing
-Check out the [guides](https://atom.io/docs/latest) and the [API reference](atom.io/docs/api).
+Check out the [guides](https://atom.io/docs/latest) and the [API reference](https://atom.io/docs/api).

apm/package.json

@@ -6,6 +6,6 @@
     "url": "https://github.com/atom/atom.git"
   },
   "dependencies": {
-    "atom-package-manager": "0.45.0"
+    "atom-package-manager": "0.46.0"
   }
 }

build/tasks/generate-license-task.coffee

@@ -26,7 +26,7 @@ module.exports = (grunt) ->
 getLicenseText = (dependencyLicenses) ->
   {keys} = require 'underscore-plus'
   text = """
-    #{fs.readFileSync('LICENSE.md')}
+    #{fs.readFileSync('LICENSE.md', 'utf8')}
 
     This application bundles the following third-party packages in accordance
     with the following licenses:\n\n

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.93.0",
+  "version": "0.94.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,7 +17,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.12.0",
+  "atomShellVersion": "0.12.2",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^0.19.0",
@@ -80,7 +80,7 @@
     "deprecation-cop": "0.5.0",
     "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
-    "feedback": "0.30.0",
+    "feedback": "0.32.0",
     "find-and-replace": "0.100.0",
     "fuzzy-finder": "0.50.0",
     "git-diff": "0.28.0",
@@ -93,7 +93,7 @@
     "metrics": "0.32.0",
     "open-on-github": "0.28.0",
     "package-generator": "0.30.0",
-    "release-notes": "0.28.0",
+    "release-notes": "0.29.0",
     "settings-view": "0.114.0",
     "snippets": "0.43.0",
     "spell-check": "0.34.0",
@@ -104,13 +104,13 @@
     "timecop": "0.18.0",
     "tree-view": "0.92.0",
     "update-package-dependencies": "0.6.0",
-    "welcome": "0.12.0",
+    "welcome": "0.13.0",
     "whitespace": "0.22.0",
     "wrap-guide": "0.18.0",
     "language-c": "0.15.0",
     "language-coffee-script": "0.22.0",
     "language-css": "0.16.0",
-    "language-gfm": "0.33.0",
+    "language-gfm": "0.34.0",
     "language-git": "0.9.0",
     "language-go": "0.10.0",
     "language-html": "0.19.0",
@@ -134,7 +134,7 @@
     "language-text": "0.6.0",
     "language-todo": "0.10.0",
     "language-toml": "0.12.0",
-    "language-xml": "0.11.0",
+    "language-xml": "0.12.0",
     "language-yaml": "0.6.0"
   },
   "private": true,

script/bootstrap

@@ -31,7 +31,7 @@ if (!fs.existsSync(apmInstallPath))
 if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
   fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
-var apmPath = 'apm/node_modules/atom-package-manager/bin/apm'
+var apmPath = path.resolve(__dirname, '..', 'apm', 'node_modules', 'atom-package-manager', 'bin', 'apm')
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
 
 var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');