Bring grunt build system up to modern times

Signed-off-by: Brian Evans <grknight@gentoo.org>

3 files changed, 31 insertions, 19 deletions

diff --git a/package.json b/package.json
index 2a4ff7f..aa9d859 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,11 @@
 {
     "name": "gentoo-tyrian",
     "version": "0.0.1",
+    "description": "Gentoo Tyrian theme",
+    "repository": "https://anongit.gentoo.org/git/sites/tyrian-theme.git",
     "devDependencies": {
-        "grunt": "~0.4.1",
-        "grunt-contrib-copy": "~0.5.0",
-        "grunt-shell": "~0.6.4"
+        "grunt": "~1.0.4",
+        "grunt-contrib-copy": "~1.0.0",
+        "grunt-shell": "~3.0.1"
     }
 }
diff --git a/sources/css/tyrian/Gruntfile.js b/sources/css/tyrian/Gruntfile.js
index 486e614..035e5b4 100644
--- a/sources/css/tyrian/Gruntfile.js
+++ b/sources/css/tyrian/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function(grunt) {
                 },
                 files: {
                     "dist/tyrian.css": "less/tyrian.less"
-                }                
+                }
             },
             minify: {
                 options: {
@@ -39,12 +39,20 @@ module.exports = function(grunt) {
                     {expand: true, flatten: true, src: ['dist/tyrian.css'], dest: 'dist/'}
                 ]
             }
-        },
-        sed: {
+	},
+	'string-replace': {
             inject_variables: {
-                path: '../bootstrap/less/bootstrap.less',
-                pattern: /@import "variables\.less";$/m,
-                replacement: '@import "variables.less"; @import "../../tyrian/bootstrap/variables-tyrian.less";'
+		options: {
+	                patterns: [
+				{
+					match: /@import "variables\.less";$/m,
+					replacement: '@import "variables.less"; @import "../../tyrian/bootstrap/variables-tyrian.less";'
+				}
+			]
+		},
+                files: [
+                    {expand: true, flatten: true, src: ['../bootstrap/less/bootstrap.less'], dest: '../bootstrap/less/'}
+                ]
             }
         },
         shell: {
@@ -61,13 +69,13 @@ module.exports = function(grunt) {
     });
 
     grunt.loadNpmTasks("grunt-contrib-less");
-    grunt.loadNpmTasks("grunt-replace");
-    grunt.loadNpmTasks("grunt-sed");
+    grunt.loadNpmTasks("grunt-replace-regex");
+    grunt.loadNpmTasks("grunt-string-replace");
     grunt.loadNpmTasks("grunt-shell");
 
     grunt.registerTask("compile", ["less:compile", "replace:compile"]);
     grunt.registerTask("compress", ["less:minify"]);
-    grunt.registerTask("bootstrap", ["sed:inject_variables", "shell:build_bootstrap"]);
+    grunt.registerTask("bootstrap", ["string-replace:inject_variables", "shell:build_bootstrap"]);
 
     grunt.registerTask("dist", ["bootstrap", "compile", "compress"]);
     grunt.registerTask("default", ["dist"]);
diff --git a/sources/css/tyrian/package.json b/sources/css/tyrian/package.json
index e5b3f3a..ef33b43 100644
--- a/sources/css/tyrian/package.json
+++ b/sources/css/tyrian/package.json
@@ -1,13 +1,15 @@
 {
   "name": "gentoo-tyrian-css",
+  "description": "CSS base for Gentoo Tyrian theme",
+  "repository": "https://anongit.gentoo.org/git/sites/tyrian-theme.git",
   "version": "0.0.1",
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-less": "~0.11.0",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-copy": "~0.5.0",
-    "grunt-replace": "~0.7.6",
-    "grunt-sed": "~0.1.0",
-    "grunt-shell": "~0.6.4"
+    "grunt": "~1.0.4",
+    "grunt-contrib-copy": "~1.0.0",
+    "grunt-contrib-less": "~2.0.0",
+    "grunt-contrib-watch": "~1.1.0",
+    "grunt-replace-regex": "~1.0.3",
+    "grunt-string-replace": "~1.3.1",
+    "grunt-shell": "~3.0.1"
   }
 }