Merge branch '2.1' into site-2.1

This commit is contained in:
Brandon Mathis 2012-05-22 17:15:30 -05:00
commit 7e5ae5ecd8
2 changed files with 5 additions and 2 deletions

View File

View File

@ -260,8 +260,11 @@ end
desc "copy dot files for deployment" desc "copy dot files for deployment"
task :copydot, :source, :dest do |t, args| task :copydot, :source, :dest do |t, args|
FileList["#{args.source}/**/.*"].exclude("**/.", "**/..", "**/.DS_Store", "**/._*").each do |file| files = [".htaccess", ".nojekyll"]
cp_r file, file.gsub(/#{args.source}/, "#{args.dest}") unless File.directory?(file) Dir["#{args.source}/.*"].each do |file|
if !File.directory?(file) && files.include?(File.basename(file))
cp(file, file.gsub(/#{args.source}/, "#{args.dest}"));
end
end end
end end