From 2bab775973e8a5c89a71192446076c3c7631c3aa Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Wed, 20 Oct 2010 22:37:50 -0700
Subject: [PATCH] ci.sh uses @diaspora gemset and forces removal of
 Gemfile.lock

---
 ci.sh            | 8 ++++----
 cruise_config.rb | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci.sh b/ci.sh
index 516deaf2e9..6604548c6c 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,9 +4,9 @@ echo "**************************************************************************
 echo "*                                  ruby 1.8.7-p249 build                                        *" &&
 echo "*************************************************************************************************" &&
 echo "" &&
-rm Gemfile.lock &&
+rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
-rvm use ruby-1.8.7-p249 &&
+rvm use ruby-1.8.7-p249@diaspora &&
 bundle install &&
 bundle exec rake cruise &&
 echo "" &&
@@ -14,8 +14,8 @@ echo "**************************************************************************
 echo "*                                   ruby 1.9.2-p0 build                                         *" &&
 echo "*************************************************************************************************" &&
 echo "" &&
-rm Gemfile.lock &&
+rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
-rvm use ruby-1.9.2-p0 &&
+rvm use ruby-1.9.2-p0@diaspora &&
 bundle install &&
 bundle exec rake cruise
diff --git a/cruise_config.rb b/cruise_config.rb
index b6a53d3cbd..a5efcd3d78 100644
--- a/cruise_config.rb
+++ b/cruise_config.rb
@@ -1,5 +1,5 @@
 require 'fileutils'
 
 Project.configure do |project|
-  project.build_command = 'ci.sh'
+  project.build_command = './ci.sh'
 end
-- 
GitLab