1 files changed, 6 insertions, 3 deletions
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