summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-11-14 15:50:22 -0800
committerelijah <elijah@riseup.net>2013-11-14 15:50:22 -0800
commit84682ee6261967935d16fbeae1190af26420563e (patch)
treeb7c1472b0f7b34fb3fea5f0fa0ec053072e53dd9
parent108938615ff7490080f80ea2d6bd1cd8037cdd84 (diff)
ensure that we only copy files when running restarting the app, not every time a rake task is run (especially since some rake tasks get run as root!)
-rw-r--r--Rakefile2
-rw-r--r--config/initializers/customization.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index 8b58316..47b6c3f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,8 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+RAKE=true # let environment initialization code know if we are running via rake or not.
+
require 'rake/packagetask'
require 'rubygems/package_task'
diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index a2f6f88..08da518 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -20,7 +20,7 @@ Rails.application.config.assets.paths.unshift "#{customization_directory}/styles
#
# Copy files to public
#
-if Dir.exists?("#{customization_directory}/public")
+if !defined?(RAKE) && Dir.exists?("#{customization_directory}/public")
require 'fileutils'
FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public")
end