From 11918dfaf583fdf8ccc52cbeff5eb5fa16af9ccd Mon Sep 17 00:00:00 2001
From: Nicklas Gummesson <nicklas@cartodb.com>
Date: Thu, 19 Feb 2015 11:07:02 +0100
Subject: [PATCH] Move sass cache dir to tmp/sass

---
 config.rb                  | 2 +-
 lib/build/tasks/clean.js   | 2 +-
 lib/build/tasks/compass.js | 6 +++---
 lib/build/tasks/copy.js    | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.rb b/config.rb
index 14d69f1882..833c23080e 100644
--- a/config.rb
+++ b/config.rb
@@ -4,7 +4,7 @@
 # Set this to the root of your project when deployed:
 http_path = "/"
 css_dir = "dist/css"
-sass_dir = "app/assets/stylesheets/tmp/"
+sass_dir = "tmp/sass/"
 images_dir = "app/assets/images/"
 #javascripts_dir = "lib/assets/javascripts"
 
diff --git a/lib/build/tasks/clean.js b/lib/build/tasks/clean.js
index 5564ccb2d5..cc12d21022 100644
--- a/lib/build/tasks/clean.js
+++ b/lib/build/tasks/clean.js
@@ -12,7 +12,7 @@
       src: [
         "lib/build/app_config.js",
         ".sass-cache",
-        "app/assets/stylesheets/tmp",
+        "tmp/sass",
         "<%= assets_dir %>"
       ]
     }
diff --git a/lib/build/tasks/compass.js b/lib/build/tasks/compass.js
index e8783538bd..3d039b8fc0 100644
--- a/lib/build/tasks/compass.js
+++ b/lib/build/tasks/compass.js
@@ -8,11 +8,11 @@
     return {
       dist: {
         options: {
-          importPath:               'app/assets/stylesheets/tmp/common',
+          importPath:               'tmp/sass/common',
 
-          sassDir:                  'app/assets/stylesheets/tmp',
+          sassDir:                  'tmp/sass',
           cssDir:                   '<%= assets_dir %>/stylesheets',
-          
+
           fontsDir:                 '<%= assets_dir %>/fonts',
           httpFontsPath:            '<%= env.http_path_prefix %>/assets/<%= pkg.version %>/fonts',
 
diff --git a/lib/build/tasks/copy.js b/lib/build/tasks/copy.js
index 71f37ded3c..6243d72333 100644
--- a/lib/build/tasks/copy.js
+++ b/lib/build/tasks/copy.js
@@ -13,7 +13,7 @@
         expand: true,
         cwd: 'vendor/assets/stylesheets/',
         src: ['**/*.css'],
-        dest: 'app/assets/stylesheets/tmp/vendor/',
+        dest: 'tmp/sass/vendor/',
         rename: function(dest, src) {
           return dest + src.replace(/\.css$/, ".scss");
         },
@@ -40,7 +40,7 @@
             expand: true,
             cwd: 'app/assets/stylesheets/',
             src: ['**/*.css.scss', '**/*.scss'],
-            dest: 'app/assets/stylesheets/tmp/',
+            dest: 'tmp/sass/',
             rename: function(dest, src) {
               return dest + src.replace(/\.css.scss$/, ".scss");
             }
@@ -51,7 +51,7 @@
             expand: true,
             cwd: 'vendor/assets/stylesheets/',
             src: ['**/*.css.scss', '**/*.scss'],
-            dest: 'app/assets/stylesheets/tmp/',
+            dest: 'tmp/sass/',
             rename: function(dest, src) {
               return dest + src.replace(/\.css.scss$/, ".scss");
             }
@@ -62,7 +62,7 @@
             expand: true,
             cwd: 'lib/assets/test/lib/jasmine-1.3.1/',
             src: ['**/*.css'],
-            dest: 'app/assets/stylesheets/tmp/specs/',
+            dest: 'tmp/sass/specs/',
             rename: function(dest, src) {
               return dest + src.replace(/\.css$/, ".scss");
             }