github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 03:32:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6179 from chancancode/fix-osx-docs

Browse Source 
Fix OSX docs
This commit is contained in:
Guo Xiang Tan 2018-07-26 09:26:48 +08:00 committed by GitHub
commit 9ccdc0da76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ruby-version.sample
View File

@ -1 +1 @@
2.4.1
2.4.4

2
README.md
View File

@ -26,7 +26,7 @@ Browse [lots more notable Discourse instances](https://www.discourse.org/custome
2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md).
Before you get started, ensure you have the following minimum versions: [Ruby 2.3+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
Before you get started, ensure you have the following minimum versions: [Ruby 2.4+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first!
## Setting up Discourse

14
docs/DEVELOPMENT-OSX-NATIVE.md
View File

@ -4,7 +4,7 @@ These instructions assume you have read and understood the **[Discourse Advanced
OS X has become a popular platform for developing Ruby on Rails applications; as such, if you run OS X, you might find it more congenial to work on **[Discourse](http://discourse.org)** in your native environment. These instructions should get you there.
Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.3 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.4+ using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started!
## Quick Setup
@ -76,11 +76,11 @@ If you do already have RVM installed, this should make sure everything is up to
# If autolibs is set to 0-2, it will give an error for things that are missing, instead.
rvm requirements
Either way, you'll now want to install the 'turbo' version of Ruby 2.0.
Either way, you'll now want to install Ruby 2.4+ (we recommend 2.4.4 or higher).
# Now, install Ruby
rvm install 2.3.4-turbo
rvm use 2.3.4 --default # Careful with this if you're already developing Ruby
rvm install 2.4.4
rvm use 2.4.4 --default # Careful with this if you're already developing Ruby
## Git
@ -190,11 +190,9 @@ Download from https://www.google.com/chrome/index.html
## ImageMagick
ImageMagick is used for generating avatars (including for test fixtures). Brew installs ImageMagick 7 by default, and this version
doesn't work with Discourse.
ImageMagick is used for generating avatars (including for test fixtures).
brew install imagemagick@6
brew link --force imagemagick@6
brew install imagemagick
ImageMagick is going to want to use the Helvetica font to generate the
letter-avatars:

6
script/osx_dev
View File

@ -40,12 +40,12 @@ source ~/.rvm/scripts/rvm
rvm get stable
rvm autolibs homebrew # Tell RVM to install anything it's missing with homebrew
rvm requirements # This will install baseline requirements that might be missing
rvm install 2.0.0-turbo # Now, install Ruby 2.0.0 with performance patches
rvm --create --ruby-version use 2.0.0-turbo # Use this Ruby as the default in this directory
rvm install 2.4.4 # Now, install Ruby 2.4.4
rvm --create --ruby-version use 2.4.4 # Use this Ruby as the default in this directory
# Check that the correct version is installed and active
echo "Checking Ruby installation..."
ruby -v | grep 2.0.0
ruby -v | grep 2.4.4
## Configure PostgreSQL (PostgreSQL was installed by Homebrew using `brew bundle`) ##
echo "Loading PostgreSQL..."