From 195108f7fc53702ffdfec03e33929cafcd2fe5db Mon Sep 17 00:00:00 2001 From: maco Date: Thu, 16 Sep 2010 23:13:33 +0000 Subject: [PATCH 1/5] README.md: add PPA instructions for rubygems 1.3.7 for Ubuntu 10.04 --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9ae943073..c0d019c4e 100644 --- a/README.md +++ b/README.md @@ -147,13 +147,13 @@ To install Git on **Mac OS X**, run the following: ### Rubygems -On **Ubuntu**, run the following: +On **Ubuntu** 10.04, run the following: - wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz - tar -xf rubygems-1.3.7.tgz - cd rubygems-1.3.7 - sudo ruby setup.rb - sudo ln -s /usr/bin/gem1.8 /usr/bin/gem + sudo add-apt-repository ppa:maco.m/ruby + sudo apt-get update + sudo apt-get install rubygems + +This PPA is maintained by an Ubuntu Developer. For Ubuntu 10.10, this version of rubygems is in the repositories. On **Fedora**, run the following: From 60d5e6a86735c990b8e2b9dfca24c5fbba259549 Mon Sep 17 00:00:00 2001 From: maco Date: Thu, 16 Sep 2010 23:25:21 +0000 Subject: [PATCH 2/5] README.md: add note about bundle's location with Ubuntu debs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0d019c4e..df195beea 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update ### Bundler -After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler. +After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler. If you're using Ubuntu repository .debs, bundler is found at /var/lib/gems/1.8/bin/bundle ## Getting Diaspora From cc44dcc7a4776b2c1fdc511728b97b8e0b43703f Mon Sep 17 00:00:00 2001 From: maco Date: Fri, 17 Sep 2010 20:40:33 +0000 Subject: [PATCH 3/5] ubuntu-setup.bash: for rubygems, use maverick's repo or if lucid use ppa or if old use tarball. create /var/lib/gems/1.8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games-friendly symlink if using debs --- ubuntu-setup.bash | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 67b602abe..2924266a5 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -54,18 +54,32 @@ echo "Installed git-core.." # Setting up ruby gems echo "Fetching and installing ruby gems.." ( - echo "." - cd /tmp - wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz - echo "." - tar -xf rubygems-1.3.7.tgz - echo "." - cd rubygems-1.3.7 - echo "." - sudo ruby setup.rb - echo "." - sudo ln -s /usr/bin/gem1.8 /usr/bin/gem - echo "." + RELEASE=$(lsb_release -c | cut -f2) + if [ RELEASE == "maverick" ] + then + sudo apt-get install --no-install-recommends -y rubygems + sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH + elsif [ RELEASE == "lucid" ] + then + sudo add-apt-repository ppa:maco.m/ruby + sudo apt-get update + sudo apt-get install --no-install-recommends -y rubygems + sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH + else + # Old version + echo "." + cd /tmp + wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz + echo "." + tar -xf rubygems-1.3.7.tgz + echo "." + cd rubygems-1.3.7 + echo "." + sudo ruby setup.rb + echo "." + sudo ln -s /usr/bin/gem1.8 /usr/bin/gem + echo "." + fi ) echo "Done installing the gems.." From 109cb49a9e5494c2e87794f504c52b5c1c820eda Mon Sep 17 00:00:00 2001 From: maco Date: Sat, 18 Sep 2010 22:10:19 +0000 Subject: [PATCH 4/5] ubuntu-setup.bash: fix s/blunder/bundler/ and s/elsif/elif/ --- ubuntu-setup.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 2924266a5..06720b3f3 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -59,7 +59,7 @@ echo "Fetching and installing ruby gems.." then sudo apt-get install --no-install-recommends -y rubygems sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH - elsif [ RELEASE == "lucid" ] + elif [ RELEASE == "lucid" ] then sudo add-apt-repository ppa:maco.m/ruby sudo apt-get update @@ -83,10 +83,10 @@ echo "Fetching and installing ruby gems.." ) echo "Done installing the gems.." -# Install blunder -echo "Installing blunder.." +# Install bundler +echo "Installing bundler.." sudo gem install bundler -echo "Installed blunder.." +echo "Installed bundler.." # Take a clone of Diaspora ( From 2aaf16f7dba90468431c8d699bda999140840c39 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 28 Sep 2010 07:50:27 +0000 Subject: [PATCH 5/5] scripts/ubuntu-setup.bash: only count universe as enabled if it's a binary repo and uncommented Signed-off-by: maco --- script/ubuntu-setup.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/ubuntu-setup.bash b/script/ubuntu-setup.bash index c335fcf65..85777fc93 100755 --- a/script/ubuntu-setup.bash +++ b/script/ubuntu-setup.bash @@ -24,9 +24,10 @@ We need to do some actions as an ordinary user. We use sudo where necessary." && sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; } # Check if universal repository is enabled -grep -i universe /etc/apt/sources.list > /dev/null || \ +grep -ie '^deb .*universe' /etc/apt/sources.list > /dev/null || \ { echo "Please enable universe repository" ; exit 1 ; } + # Make sure that we only install the latest version of packages sudo apt-get update