From 51ad614bd2b5268ea3c7bb7ca8afbb7cafad9dfb Mon Sep 17 00:00:00 2001 From: Patrick Aikens Date: Sat, 1 Feb 2014 00:09:38 -0500 Subject: [PATCH 1/2] Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index f2372aa..c766324 100644 --- a/Rakefile +++ b/Rakefile @@ -187,8 +187,8 @@ task :update_style, :theme do |t, args| end mv "sass", "sass.old" puts "## Moved styles into sass.old/" - cp_r "#{themes_dir}/"+theme+"/sass/", "sass" - cp_r "sass/custom/.", "sass.old/custom" + cp_r "#{themes_dir}/"+theme+"/sass/", "sass", :remove_destination=>true + cp_r "sass.old/custom/.", "sass.old/custom/", :remove_destination=>true puts "## Updated Sass ##" end From c139f680e194435d075b4cc17840d1f502a6a36c Mon Sep 17 00:00:00 2001 From: Patrick Aikens Date: Sat, 1 Feb 2014 00:20:19 -0500 Subject: [PATCH 2/2] Fix typo in update_style copy command --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index c766324..cec8e05 100644 --- a/Rakefile +++ b/Rakefile @@ -188,7 +188,7 @@ task :update_style, :theme do |t, args| mv "sass", "sass.old" puts "## Moved styles into sass.old/" cp_r "#{themes_dir}/"+theme+"/sass/", "sass", :remove_destination=>true - cp_r "sass.old/custom/.", "sass.old/custom/", :remove_destination=>true + cp_r "sass.old/custom/.", "sass/custom/", :remove_destination=>true puts "## Updated Sass ##" end