Skip to content

Commit 2f1a229

Browse files
committed
fix(gen:openshift): allow for grunt or gulp
1 parent 954baa4 commit 2f1a229

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Diff for: openshift/index.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,13 @@ Generator.prototype.enableOpenShiftHotDeploy = function enableOpenshiftHotDeploy
193193
});
194194
};
195195

196-
Generator.prototype.gruntBuild = function gruntBuild() {
196+
Generator.prototype.build = function build() {
197197
if(this.abort || !this.openshift_remote_exists ) return;
198198
var done = this.async();
199+
var buildCommand = this.filters.grunt ? 'grunt build' : 'gulp build';
199200

200201
this.log(chalk.bold('\nBuilding dist folder, please wait...'));
201-
var child = exec('grunt build', function (err, stdout) {
202+
var child = exec(buildCommand, function (err, stdout) {
202203
if (err) {
203204
this.log.error(err);
204205
}
@@ -294,7 +295,12 @@ Generator.prototype.restartApp = function restartApp() {
294295
this.log(chalk.green('\nYou may need to address the issues mentioned above and restart the server for the app to work correctly \n\t' +
295296
'rhc app-restart -a ' + this.deployedName));
296297
}
297-
this.log(chalk.yellow('After app modification run\n\t' + chalk.bold('grunt build') +
298-
'\nThen deploy with\n\t' + chalk.bold('grunt buildcontrol:openshift')));
298+
299+
this.log(chalk.yellow(
300+
'After app modification run\n\t' +
301+
chalk.bold(this.filters.grunt ? 'grunt build' : 'gulp build') +
302+
'\nThen deploy with\n\t' +
303+
chalk.bold(this.filters.grunt ? 'grunt buildcontrol:openshift' : 'gulp buildcontrol:openshift')
304+
));
299305
}.bind(this));
300306
};

0 commit comments

Comments
 (0)