Skip to content

Commit

Permalink
Merge pull request atom#2074 from dertuxmalwieder/master
Browse files Browse the repository at this point in the history
+FreeBSD, -bullshit
  • Loading branch information
Paul Betts committed May 10, 2014
2 parents c79ef04 + d6a4c70 commit 5b0d974
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Atom will automatically update when a new release is available.

* [Linux](docs/build-instructions/linux.md)
* [OS X](docs/build-instructions/os-x.md)
* [FreeBSD](docs/build-instructions/freebsd.md)
* [Windows](docs/build-instructions/windows.md)

## Developing
Expand Down
22 changes: 22 additions & 0 deletions docs/build-instructions/freebsd.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# FreeBSD

FreeBSD -RELEASE 64-bit is the recommended platform.

## Requirements

* FreeBSD
* `pkg install node`
* `pkg install npm`
* `pkg install libgnome-keyring`
* `npm config set python /usr/local/bin/python2 -g` to ensure that gyp uses Python 2

## Instructions

```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
```

## Troubleshooting
2 changes: 1 addition & 1 deletion docs/build-instructions/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform.
* OS with 64-bit architecture
* [node.js](http://nodejs.org/download/) v0.10.x
* [npm](http://www.npmjs.org/) v1.4.x
* libgnome-keyring-dev `sudo apt-get install libgnome-keyring-dev`
* libgnome-keyring-dev `sudo apt-get install libgnome-keyring-dev` (refer to your distribution's manual on how to install packages if you are not on Debian or Ubuntu-based systems)
* `npm config set python /usr/bin/python2 -g` to ensure that gyp uses Python 2

## Instructions
Expand Down

0 comments on commit 5b0d974

Please sign in to comment.