Rename CSS portion to gentoo-tyrian-css, adapt Grunt functionality

2 files changed, 8 insertions, 32 deletions

diff --git a/sources/css/tyrian/Gruntfile.js b/sources/css/tyrian/Gruntfile.js
index 9fc0873..d48c6e9 100644
--- a/sources/css/tyrian/Gruntfile.js
+++ b/sources/css/tyrian/Gruntfile.js
@@ -40,36 +40,14 @@ module.exports = function(grunt) {
                 ]
             }
         },
-        copy: {
-            update_assets: {
-                files: [
-                    { expand: true, cwd: '../bootstrap/dist/css/', src: ['bootstrap.css', 'bootstrap.min.css'], dest: '../../../assets/css/'},
-                    { expand: true, cwd: '../bootstrap/dist/fonts/', src: '*', dest: '../../../assets/fonts/'},
-                    { expand: true, cwd: '../bootstrap/dist/js/', src: '*', dest: '../../../assets/js/'},
-                    { expand: true, cwd: 'dist/', src: 'tyrian*.css', dest: '../../../assets/css/'},
-                    { expand: true, cwd: 'fonts/', src: '*', dest: '../../../assets/fonts/'},
-                ]
-            }
-        },
         sed: {
             inject_variables: {
                 path: '../bootstrap/less/bootstrap.less',
-                pattern: '@import "variables.less";',
+                pattern: /@import "variables\.less";$/m,
                 replacement: '@import "variables.less"; @import "../../tyrian/bootstrap/variables-tyrian.less";'
             }
         },
         shell: {
-            update_bootstrap: {
-                command: [
-                    'git checkout -- .',
-                    'git pull --rebase'
-                ].join('&&'),
-                options: {
-                    execOptions: {
-                        cwd: '../bootstrap/'
-                    }
-                }
-            },
             build_bootstrap: {
                 command: 'grunt dist',
                 options: {
@@ -82,7 +60,6 @@ module.exports = function(grunt) {
         }
     });
 
-    grunt.loadNpmTasks("grunt-contrib-copy");
     grunt.loadNpmTasks("grunt-contrib-less");
     grunt.loadNpmTasks("grunt-replace");
     grunt.loadNpmTasks("grunt-sed");
@@ -94,15 +71,14 @@ module.exports = function(grunt) {
     // Compresses tyrian sources
     grunt.registerTask("compress", ["less:minify"]);
 
-    // Updates assets in the main directory
-    grunt.registerTask("update_assets", ["copy:update_assets"]);
-
     // Updates bootstrap, injects our custom variables, and builds bootstrap
-    grunt.registerTask("bootstrap", ["shell:update_bootstrap", "sed:inject_variables", "shell:build_bootstrap"]);
+    grunt.registerTask("bootstrap", [ "sed:inject_variables", "shell:build_bootstrap"]);
 
     // by default: compile and compress
-    grunt.registerTask("default", ["compile", "compress"]);
+    grunt.registerTask("dist", ["compile", "compress"]);
+
+    grunt.registerTask("default", ["compile"]);
 
-    grunt.registerTask("all", ["bootstrap", "compile", "compress", "update_assets"]);
+    grunt.registerTask("all", ["bootstrap", "compile", "compress"]);
 };
 
diff --git a/sources/css/tyrian/package.json b/sources/css/tyrian/package.json
index bc2295f..e5b3f3a 100644
--- a/sources/css/tyrian/package.json
+++ b/sources/css/tyrian/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "gentoo-tyrian",
+  "name": "gentoo-tyrian-css",
   "version": "0.0.1",
   "devDependencies": {
     "grunt": "~0.4.1",
@@ -10,4 +10,4 @@
     "grunt-sed": "~0.1.0",
     "grunt-shell": "~0.6.4"
   }
-}
\ No newline at end of file
+}