From c1cda5e42144df679ac5487c1e8e7413e04ed8e2 Mon Sep 17 00:00:00 2001
From: Rei <chloerei@gmail.com>
Date: Mon, 14 Jul 2014 14:52:28 +0800
Subject: [PATCH] remove rvm deploy config

---
 Capfile                  | 10 +++-------
 config/resque.example.sh |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Capfile b/Capfile
index 27bef15..fe55f6e 100644
--- a/Capfile
+++ b/Capfile
@@ -3,13 +3,9 @@ require 'capistrano/setup'
 
 # Includes default deployment tasks
 require 'capistrano/deploy'
-
-unless ARGV.any? { |task| task =~ /provision/ }
-  require 'capistrano/rvm'
-  require 'capistrano/bundler'
-  require 'capistrano/rails/assets'
-  require 'capistrano/rails/migrations'
-end
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/config/resque.example.sh b/config/resque.example.sh
index 5746354..1cc8af3 100644
--- a/config/resque.example.sh
+++ b/config/resque.example.sh
@@ -37,7 +37,7 @@ case "$1" in
       if test -s "$pidfile" && run "kill -0 `cat $pidfile`"; then
         echo "Worker `cat $pidfile` alread running"
       else
-        run "cd $APP_ROOT; HOME=/home/$USER bundle exec rake environment resque:work QUEUE=$QUEUES PIDFILE=$pidfile TERM_CHILD=1 BACKGROUND=yes RAILS_ENV=production > /dev/null 2>&1"
+        run "cd $APP_ROOT; bundle exec rake environment resque:work QUEUE=$QUEUES PIDFILE=$pidfile TERM_CHILD=1 BACKGROUND=yes RAILS_ENV=production > /dev/null 2>&1"
         echo "Start worker `cat $pidfile`"
       fi
     done