fixes to install scripts

INSTALL.debian

@@ -89,14 +89,16 @@ sudo -u danbooru git clone https://github.com/r888888888/danbooru ~danbooru/danb
 sudo -u danbooru bash -l -c 'cd ~/danbooru ; bundle'
 
 echo "* Creating a new local git branch called develop"
-sudo -u danbooru bash -l -c 'cd ~danbooru ; git checkout -b develop'
+sudo -u danbooru bash -l -c 'cd ~/danbooru ; git checkout -b develop'
+
+mkdir -p /var/www/danbooru2
+chown danbooru:danbooru /var/www/danbooru2
 
 echo "* Almost done! The code has been checked out at ~danbooru/danbooru. You can  "
 echo "* now login as the danbooru user and run the following commands to deploy to "
 echo "* the server:"
 echo "*"
 echo "*   cd ~/danbooru"
-echo "*   bundle exec cap development deploy:setup"
+echo "*   bundle exec cap development deploy:cold"
-echo "*   bundle exec cap development deploy:update"
 
 

config/deploy/development.rb

@@ -1,2 +1,3 @@
+set :user, "danbooru"
 set :rails_env, "development"
 server "localhost", :roles => %w(web app db), :primary => true

lib/capistrano/tasks/delayed_job.cap

@@ -2,10 +2,12 @@ namespace :delayed_job do
   desc "Start delayed_job process"
   task :start do
     on roles(:app) do
-      within current_path do
+      if test("[ -d #{current_path} ]")
-        with rails_env: fetch(:rails_env) do
+        within current_path do
-          hostname = capture("hostname").strip
+          with rails_env: fetch(:rails_env) do
-          execute :bundle, "exec", "script/delayed_job", "--queues=default,#{hostname}", "-n 2", "start"
+            hostname = capture("hostname").strip
+            execute :bundle, "exec", "script/delayed_job", "--queues=default,#{hostname}", "-n 2", "start"
+          end
         end
       end
     end
@@ -14,9 +16,11 @@ namespace :delayed_job do
   desc "Stop delayed_job process"
   task :stop do
     on roles(:app) do
-      within current_path do
+      if test("[ -d #{current_path} ]")
-        with rails_env: fetch(:rails_env) do
+        within current_path do
-          execute :bundle, "exec", "script/delayed_job", "stop"
+          with rails_env: fetch(:rails_env) do
+            execute :bundle, "exec", "script/delayed_job", "stop"
+          end
         end
       end
     end