Browse code

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

Frederic Hemberger authored on 30/09/2011 at 13:29:37
Showing 1 changed files
... ...
@@ -188,8 +188,9 @@ task :update_source, :theme do |t, args|
188 188
   puts "## Copied #{source_dir} into #{source_dir}.old/"
189 189
   cp_r "#{themes_dir}/"+theme+"/source/.", source_dir, :remove_destination=>true
190 190
   cp_r "#{source_dir}.old/_includes/custom/.", "#{source_dir}/_includes/custom/", :remove_destination=>true
191
+  cp "#{source_dir}.old/favicon.png", source_dir
191 192
   mv "#{source_dir}/index.html", "#{blog_index_dir}", :force=>true if blog_index_dir != source_dir
192
-  cp "#{source_dir}.old/index.html", source_dir if blog_index_dir != source_dir
193
+  cp "#{source_dir}.old/index.*", source_dir if blog_index_dir != source_dir
193 194
   puts "## Updated #{source_dir} ##"
194 195
 end
195 196