From d7e546c3b3b5968bce1d177822a28319be47cf45 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Wed, 21 Jul 2010 15:26:08 -0700
Subject: [PATCH 1/2] RS IZ Vim in sprinkle, not too nice

---
 config/sprinkle/packages/essential.rb | 16 ++++++++++++----
 config/sprinkle/provision.rb          | 15 ++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/config/sprinkle/packages/essential.rb b/config/sprinkle/packages/essential.rb
index 0699a8b16..0d69e7510 100644
--- a/config/sprinkle/packages/essential.rb
+++ b/config/sprinkle/packages/essential.rb
@@ -11,11 +11,19 @@ end
 package :tools do
   description 'Useful tools'
   apt 'psmisc htop elinks screen'
-  requires :vim
 end
 
 package :vim do
-  run("cd && git clone git@github.com:zhitomirskiyi/vim-files.git")
-  run("ln -s /root/vim-files/vimrc /root/.vimrc") 
-  run("ln -s -f -T /root/vim-files /root/.vim")
+  apt 'vim' do 
+    post :install, run("rm -r -f /root/vim-files")
+  end
+  apt 'vim' do 
+    post :install, run("git clone git://github.com/zhitomirskiyi/vim-files.git /root/vim-files")
+  end
+  apt 'vim' do 
+    post :install, run("ln -s -f /root/vim-files/vimrc /root/.vimrc") 
+  end
+  apt 'vim' do 
+    post :install, run("ln -s -f -T /root/vim-files /root/.vim")
+  end
 end
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index b922a4137..2223de3d4 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -35,13 +35,14 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
 
 policy :diaspora, :roles => [:tom, :backer] do
 #  requires :clean_dreamhost
-  requires :tools
-  requires :rubygems
-	requires :bundler
-  requires :diaspora_dependencies
-  requires :database
-  requires :webserver
-  requires :scm
+#  requires :tools
+#  requires :rubygems
+#	requires :bundler
+#  requires :diaspora_dependencies
+#  requires :database
+#  requires :webserver
+#  requires :scm
+  requires :vim
 end
 =begin
 

From 9b4d92e1fa97aa08c874fc72b2d66542f793069a Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Wed, 21 Jul 2010 15:36:14 -0700
Subject: [PATCH 2/2] trying to patch relationship controller

---
 app/controllers/requests_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index aeea38e05..1f01180dc 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -25,7 +25,7 @@ class RequestsController < ApplicationController
   end
   
   def create
-    url = diaspora_url(params[:request][:destination_url])
+    url = relationship_flow(params[:request][:destination_url]).values.first
     @request = current_user.send_friend_request_to(url) unless url.include?('@')|| url == ''
     if @request
       flash[:notice] = "a friend request was sent to #{@request.destination_url}"