Merge branch 'pr/28'

[arvados.git] / doc / _includes / _install_ruby_and_bundler.liquid

diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid
index 55627b4d5af50ef3ccce2d9657d131e8e163275c..e79cffb7f86dd9adf5a622b231ceda25e057f4e4 100644 (file)
--- a/doc/_includes/_install_ruby_and_bundler.liquid
+++ b/doc/_includes/_install_ruby_and_bundler.liquid
@@ -1,12 +1,10 @@
 Currently, only Ruby 2.1 is supported.
 
-h4(#rvm). *Option 1: Install with rvm*
+h4(#rvm). *Option 1: Install with RVM*
 
 <notextile>
 <pre><code><span class="userinput">sudo gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 \curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.1
-sudo -i gem install bundler
-sudo adduser "$USER" rvm
 </span></code></pre></notextile>
 
 Either log out and log back in to activate RVM, or explicitly load it in all open shells like this:
@@ -15,6 +13,12 @@ Either log out and log back in to activate RVM, or explicitly load it in all ope
 <pre><code><span class="userinput">source /usr/local/rvm/scripts/rvm
 </span></code></pre></notextile>
 
+Once RVM is activated in your shell, install Bundler:
+
+<notextile>
+<pre><code>~$ <span class="userinput">gem install bundler</span>
+</code></pre></notextile>
+
 h4(#fromsource). *Option 2: Install from source*
 
 Install prerequisites for Debian 7 or 8:
@@ -41,7 +45,7 @@ Install prerequisites for Ubuntu 12.04 or 14.04:
 <pre><code><span class="userinput">sudo apt-get install \
     gawk g++ gcc make libc6-dev libreadline6-dev zlib1g-dev libssl-dev \
     libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev \
-    libncurses5-dev automake libtool bison pkg-config libffi-dev
+    libncurses5-dev automake libtool bison pkg-config libffi-dev curl
 </span></code></pre></notextile>
 
 Build and install Ruby:
@@ -49,9 +53,9 @@ Build and install Ruby:
 <notextile>
 <pre><code><span class="userinput">mkdir -p ~/src
 cd ~/src
-curl http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.6.tar.gz | tar xz
-cd ruby-2.1.6
-./configure --no-install-rdoc
+curl http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.7.tar.gz | tar xz
+cd ruby-2.1.7
+./configure --disable-install-rdoc
 make
 sudo make install