From 3e16903c8f99aed6194bce8ce6c9701abd94b1cf Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Thu, 25 Apr 2019 10:48:15 -0400
Subject: Further grunt updates

Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 Gruntfile.js                    | 2 +-
 sources/css/tyrian/Gruntfile.js | 8 +++-----
 sources/css/tyrian/package.json | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4154ea8..f2a6931 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,7 +8,7 @@ module.exports = function(grunt) {
         pkg: grunt.file.readJSON('package.json'),
         shell: {
             update_bootstrap: {
-                command: ['git checkout -- .', 'git pull --rebase'].join('&&'),
+                command: ['git submodule update --init --checkout', 'npm i'].join('&&'),
                 options: {
                     execOptions: {
                         cwd: 'sources/css/bootstrap/'
diff --git a/sources/css/tyrian/Gruntfile.js b/sources/css/tyrian/Gruntfile.js
index 035e5b4..35cf114 100644
--- a/sources/css/tyrian/Gruntfile.js
+++ b/sources/css/tyrian/Gruntfile.js
@@ -38,9 +38,7 @@ module.exports = function(grunt) {
                 files: [
                     {expand: true, flatten: true, src: ['dist/tyrian.css'], dest: 'dist/'}
                 ]
-            }
-	},
-	'string-replace': {
+            },
             inject_variables: {
 		options: {
 	                patterns: [
@@ -51,7 +49,7 @@ module.exports = function(grunt) {
 			]
 		},
                 files: [
-                    {expand: true, flatten: true, src: ['../bootstrap/less/bootstrap.less'], dest: '../bootstrap/less/'}
+			{expand: true, flatten: true, src: ['../bootstrap/less/bootstrap.less'], dest: '../bootstrap/less/'}
                 ]
             }
         },
@@ -75,7 +73,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask("compile", ["less:compile", "replace:compile"]);
     grunt.registerTask("compress", ["less:minify"]);
-    grunt.registerTask("bootstrap", ["string-replace:inject_variables", "shell:build_bootstrap"]);
+    grunt.registerTask("bootstrap", ["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 ef33b43..4246541 100644
--- a/sources/css/tyrian/package.json
+++ b/sources/css/tyrian/package.json
@@ -9,7 +9,6 @@
     "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"
   }
 }
-- 
cgit v1.2.3-65-gdbad