From 706d47fb5b9d102dbbcd55e92e2824c96a6652f5 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Sat, 18 Jun 2016 18:35:51 +0100
Subject: [PATCH] Use subgrunt to install client dependencies

closes https://github.com/TryGhost/Ghost/pull/7005, requires https://github.com/TryGhost/Ghost-Admin/pull/79
- defers to client's Gruntfile to install client dependencies, avoids requirement for a global bower install
---
 Gruntfile.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index ac3e407b02..68decedbca 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -232,9 +232,6 @@ var _              = require('lodash'),
                 ember: {
                     command: function (mode) {
                         switch (mode) {
-                            case 'init':
-                                return 'echo Installing client dependencies... && npm install && bower install';
-
                             case 'prod':
                                 return emberPath + ' build --environment=production --silent';
 
@@ -347,6 +344,10 @@ var _              = require('lodash'),
             // ### grunt-subgrunt
             // Run grunt tasks in submodule Gruntfiles
             subgrunt: {
+                init: {
+                    'core/client': 'init'
+                },
+
                 lint: {
                     'core/client': 'lint'
                 }
@@ -769,7 +770,7 @@ var _              = require('lodash'),
         // `bower` does have some quirks, such as not running as root. If you have problems please try running
         // `grunt init --verbose` to see if there are any errors.
         grunt.registerTask('init', 'Prepare the project for development',
-            ['update_submodules', 'shell:ember:init', 'assets', 'default']);
+            ['update_submodules', 'subgrunt:init', 'assets', 'default']);
 
         // ### Basic Asset Building
         // Builds and moves necessary client assets. Prod additionally builds the ember app.