From 625bd428a175ddec509f6c2bfed46a2404579b50 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sat, 30 Oct 2010 13:18:56 +0200
Subject: [PATCH] bugfixes. Rewrite http: github path to git:

---
 Gemfile                   | 2 +-
 pkg/fedora/diaspora-setup | 2 +-
 pkg/fedora/make-dist.sh   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 457bfd75b..2b2b8eb92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
 gem 'addressable', :require => 'addressable/uri'
 gem 'json'
 gem 'mini_fb'
-gem 'http_accept_language', :git => 'http://github.com/iain/http_accept_language.git'
+gem 'http_accept_language', :git => git://github.com/iain/http_accept_language.git'
 
 #Standards
 gem 'pubsubhubbub'
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index 56fb030a8..726cfe148 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -30,7 +30,7 @@ ln -sf /usr/lib/diaspora-bundle/Gemfile.lock .
 test -e config/app_config.yml ||
     cp config/app_config.yml.example config/app_config.yml
 
-if rake db:seed:dev; then
+if bundle exec rake db:seed:dev; then
     echo "Database config OK, new user tom/evankorth in place"
 else
     cat <<- EOF
diff --git a/pkg/fedora/make-dist.sh b/pkg/fedora/make-dist.sh
index 8da155d59..5d6d1cdba 100755
--- a/pkg/fedora/make-dist.sh
+++ b/pkg/fedora/make-dist.sh
@@ -278,8 +278,8 @@ function make_bundle()
 
                 make_docs "vendor/bundle/ruby/1.8/gems/"  "../$bundle_name/docs"
                 mv vendor/cache ../$bundle_name/vendor
+                mv vendor/gems ../$bundle_name/vendor
                 mv git-repos ../$bundle_name
-                rm -rf vendor/gems/*
             cd ..
             tar czf $bundle_name.tar.gz $bundle_name
             mv $bundle_name/vendor/cache diaspora/vendor/cache