Merge branch 'master' of github.com:imathis/octopress

This commit is contained in:
Frederic Hemberger 2011-09-30 15:29:37 +02:00
commit 362d93d938

View File

@ -188,8 +188,9 @@ task :update_source, :theme do |t, args|
puts "## Copied #{source_dir} into #{source_dir}.old/" puts "## Copied #{source_dir} into #{source_dir}.old/"
cp_r "#{themes_dir}/"+theme+"/source/.", source_dir, :remove_destination=>true cp_r "#{themes_dir}/"+theme+"/source/.", source_dir, :remove_destination=>true
cp_r "#{source_dir}.old/_includes/custom/.", "#{source_dir}/_includes/custom/", :remove_destination=>true cp_r "#{source_dir}.old/_includes/custom/.", "#{source_dir}/_includes/custom/", :remove_destination=>true
cp "#{source_dir}.old/favicon.png", source_dir
mv "#{source_dir}/index.html", "#{blog_index_dir}", :force=>true if blog_index_dir != source_dir mv "#{source_dir}/index.html", "#{blog_index_dir}", :force=>true if blog_index_dir != source_dir
cp "#{source_dir}.old/index.html", source_dir if blog_index_dir != source_dir cp "#{source_dir}.old/index.*", source_dir if blog_index_dir != source_dir
puts "## Updated #{source_dir} ##" puts "## Updated #{source_dir} ##"
end end