diff --git a/lib/whenever/capistrano/v2/recipes.rb b/lib/whenever/capistrano/v2/recipes.rb index 1deb8703..247d2dcd 100644 --- a/lib/whenever/capistrano/v2/recipes.rb +++ b/lib/whenever/capistrano/v2/recipes.rb @@ -11,6 +11,7 @@ _cset(:whenever_variables) { "environment=#{fetch :whenever_environment}" } _cset(:whenever_update_flags) { "--update-crontab #{fetch :whenever_identifier} --set #{fetch :whenever_variables}" } _cset(:whenever_clear_flags) { "--clear-crontab #{fetch :whenever_identifier}" } + _cset(:whenever_path) { fetch :latest_release } namespace :whenever do desc "Update application's crontab entries using Whenever" @@ -18,7 +19,7 @@ args = { :command => fetch(:whenever_command), :flags => fetch(:whenever_update_flags), - :path => fetch(:latest_release) + :path => fetch(:whenever_path) } if whenever_servers.any? @@ -38,7 +39,7 @@ args = { :command => fetch(:whenever_command), :flags => fetch(:whenever_clear_flags), - :path => fetch(:latest_release) + :path => fetch(:whenever_path) } whenever_run_commands(args) diff --git a/lib/whenever/capistrano/v3/tasks/whenever.rake b/lib/whenever/capistrano/v3/tasks/whenever.rake index d8aa6663..48d374ff 100644 --- a/lib/whenever/capistrano/v3/tasks/whenever.rake +++ b/lib/whenever/capistrano/v3/tasks/whenever.rake @@ -4,7 +4,7 @@ namespace :whenever do on roles fetch(:whenever_roles) do |host| args_for_host = block_given? ? args + Array(yield(host)) : args - within release_path do + within fetch(:whenever_path) do with fetch(:whenever_command_environment_variables) do execute *args_for_host end @@ -39,5 +39,6 @@ namespace :load do set :whenever_variables, ->{ "environment=#{fetch :whenever_environment}" } set :whenever_update_flags, ->{ "--update-crontab #{fetch :whenever_identifier} --set #{fetch :whenever_variables}" } set :whenever_clear_flags, ->{ "--clear-crontab #{fetch :whenever_identifier}" } + set :whenever_path, ->{ fetch :release_path } end end