From e9d6fea533e6b6fd1d9a6024de113370fdd13926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=BCtke?= Date: Mon, 13 Mar 2006 18:45:40 +0000 Subject: Don't replace application.js in public/javascripts if it already exists [Cody Fauser]. Closes #4195 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3863 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/tasks/framework.rake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'railties/lib/tasks/framework.rake') diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index 9e39e02edb..4ac7f7ebe0 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -85,9 +85,12 @@ namespace :rails do end desc "Update your javascripts from your current rails install" - task :javascripts do + task :javascripts do require 'railties_path' - FileUtils.cp(Dir[RAILTIES_PATH + '/html/javascripts/*.js'], RAILS_ROOT + '/public/javascripts/') + project_dir = RAILS_ROOT + '/public/javascripts/' + scripts = Dir[RAILTIES_PATH + '/html/javascripts/*.js'] + scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js') + FileUtils.cp(scripts, project_dir) end end -end \ No newline at end of file +end -- cgit v1.2.3