aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Hemberger <mail@frederic-hemberger.de>2011-09-30 15:29:37 +0200
committerFrederic Hemberger <mail@frederic-hemberger.de>2011-09-30 15:29:37 +0200
commit362d93d9380ca3fce20b1dd2cf03142a5340db08 (patch)
tree981e3b4ce1268dd9248cb0085ad26bd4360c1db5
parent2f7d9f3896801adfd80376144daa2d7d7fa24d55 (diff)
parentbdf904adfff7c1ca0c340dbc36bd9ccff05513ee (diff)
downloadmy_new_personal_website-362d93d9380ca3fce20b1dd2cf03142a5340db08.tar.xz
my_new_personal_website-362d93d9380ca3fce20b1dd2cf03142a5340db08.zip
Merge branch 'master' of github.com:imathis/octopress
-rw-r--r--Rakefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index 1c7dc874..03580090 100644
--- a/Rakefile
+++ b/Rakefile
@@ -188,8 +188,9 @@ task :update_source, :theme do |t, args|
puts "## Copied #{source_dir} into #{source_dir}.old/"
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 "#{source_dir}.old/favicon.png", 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} ##"
end