aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installing
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installing')
-rw-r--r--docs/installing/macos.md14
1 files changed, 4 insertions, 10 deletions
diff --git a/docs/installing/macos.md b/docs/installing/macos.md
index e93ea452f..2c08be0e5 100644
--- a/docs/installing/macos.md
+++ b/docs/installing/macos.md
@@ -71,7 +71,7 @@ Read `rvm notes` and `rvm requirements` carefully for further instructions. Then
The `mahoro` and `pg` gems require special installation commands. Rubygems must be downgraded to 1.6.2 to avoid deprecation warnings when running tests.
rvm 1.8.7
- gem update --system 1.6.2
+ gem update --system 2.1.11
gem install mahoro -- --with-ldflags="-L/usr/local/Cellar/libmagic/5.09/lib" --with-cppflags="-I/usr/local/Cellar/libmagic/5.09/include"
env ARCHFLAGS="-arch x86_64" gem install pg
@@ -96,8 +96,9 @@ Create a `foi` user from the command line, like this:
createuser -s -P foi
-_Note:_ Leaving the password blank will cause great confusion if you're new to
-PostgreSQL.
+_Note:_ After running this command you will be prompted to set a
+password for the user. Don't leave it blank if you are new to
+PostgreSQL, or it could be difficult to set later for you.
We'll create a template for our Alaveteli databases:
@@ -112,18 +113,11 @@ Then create the databases:
### Clone Alaveteli
-We don't want to vendor Rails, as it causes problems locally.
-
git clone https://github.com/mysociety/alaveteli.git
cd alaveteli
git submodule init
-
- sed -i~ 's/\\[submodule "vendor\/rails"\\]//' .git/config
-
- sed -i~ 's/url = git:\/\/github.com\/rails\/rails.git//' .git/config
git submodule update
-**Note:** Due to Markdown bugs, the first `sed` command above does not display properly if it appears in blockquote.
### Configure Alaveteli