Merge pull request #383 from ruyadorno/fix-bower-install

Fixes bower install on app generator
yeoman · Jan 30, 2016 · 36d7dc9 · 36d7dc9
2 parents 8e426e5 + 2daabdc
commit 36d7dc9
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -396,8 +396,14 @@ var BackboneGenerator = yeoman.generators.Base.extend({
   },
 
   install: function () {
-    if (['backbone:app', 'backbone'].indexOf(this.options.namespace) >= 0) {
-      this.installDependencies({ skipInstall: this.options['skip-install'] });
+    var shouldInstall = !this.options['skip-install'];
+    var isInstallable = ['backbone:app', 'backbone'].indexOf(this.options.namespace) > -1;
+    if (shouldInstall && isInstallable) {
+      this.npmInstall();
+      this.bowerInstall('', {
+        'config.cwd': this.destinationPath('.'),
+        'config.directory': path.join(this.config.get('appPath'), 'bower_components')
+      });
     }
   }
 });