@@ -30,9 +30,8 @@ unless defined?(RAILS_ROOT) end unless defined? CRUISE_DATA_ROOT - old_projects_path = File.join(RAILS_ROOT, 'projects') - if File.directory?(old_projects_path) - CRUISE_DATA_ROOT = old_projects_path + if ENV['CRUISE_DATA_ROOT'] + CRUISE_DATA_ROOT = ENV['CRUISE_DATA_ROOT'] else CRUISE_DATA_ROOT = File.join(find_home, ".cruise") end config/boot.rb @@ -41,11 +41,8 @@ Capistrano::Configuration.instance(:must_exist).load do sudo "rm -rf #{release_path}/projects" sudo "mkdir -p #{shared_path}/projects" sudo "chmod -R 775 #{shared_path}/projects" - sudo "chown deployer #{shared_path}/projects" - sudo "chgrp rails #{shared_path}/projects" + sudo "chown deployer:rails #{shared_path}/projects" sudo "ln -nfs #{shared_path}/projects #{release_path}/projects" - sudo "touch #{shared_path}/site_config.rb" - sudo "ln -nfs #{shared_path}/site_config.rb #{release_path}/config/site_config.rb" end end config/recipes/cruisecontrol.rb @@ -4,7 +4,7 @@ include FileUtils DATA_ROOT = ARGV[0] RAILS_ROOT = File.expand_path(".") -if File.exists? 'projects' +if File.directory? 'projects' mv 'projects', DATA_ROOT + '/projects' else mkdir_p DATA_ROOT + '/projects' db/migrate/002_move_custom_files_to_directory_in_user_home.rb a41685cc3e1c63cc7f05838d9188d6c71617af27 alexeyv alexeyv@c04ce798-636b-4ca8-9149-0f9336831111 http://github.com/dustin/cruisecontrolrb/commit/2e1990b5aad62bdff0afc93c6b26746469a8e76b 2e1990b5aad62bdff0afc93c6b26746469a8e76b 2008-02-21T17:31:12-08:00 2008-02-21T17:31:12-08:00 instead of previous checkin, making it actually look at ENV['CRUISE_DATA_ROOT'] git-svn-id: http://cruisecontrolrb.rubyforge.org/svn/trunk@606 c04ce798-636b-4ca8-9149-0f9336831111 0e2b55125f6040d6cdfcf48bf9a457d631390785 alexeyv alexeyv@c04ce798-636b-4ca8-9149-0f9336831111