@@ -188,11 +188,13 @@ var util = module.exports = {
188
188
189
189
/* Read in whatever angular versions are in lib/test/angular and register karma configs for them all! */
190
190
createKarmangularConfig : function ( ) {
191
+ var versions ;
192
+
191
193
if ( grunt . option ( 'fast' ) ) {
192
- var versions = [ util . latestAngular ( ) ] ;
194
+ versions = [ util . latestAngular ( ) ] ;
193
195
} else {
194
196
// For each file found, make sure it's a directory...
195
- var versions = grunt . option ( 'angular' ) ? grunt . option ( 'angular' ) . split ( / , / ) : null || util . angulars ( ) ;
197
+ versions = grunt . option ( 'angular' ) ? grunt . option ( 'angular' ) . split ( / , / ) : null || util . angulars ( ) ;
196
198
}
197
199
198
200
if ( grunt . option ( 'angular' ) ) {
@@ -295,7 +297,7 @@ var util = module.exports = {
295
297
getCurrentTag : function ( ) {
296
298
var out = shell . exec ( 'git tag -l --points-at HEAD' , { silent :true } ) ;
297
299
298
- return out . output . trim ( ) ;
300
+ return out . stdout . trim ( ) ;
299
301
} ,
300
302
301
303
// Get the current release version
@@ -306,19 +308,19 @@ var util = module.exports = {
306
308
var version , tag ;
307
309
308
310
// If there's a tag on this commit, use it as the version
309
- if ( out . code === 0 && out . output . trim ( ) !== '' && out . output . trim ( ) !== null ) {
310
- version = out . output . trim ( ) ;
311
+ if ( out . code === 0 && out . stdout && out . stdout . trim ( ) !== '' && out . stdout . trim ( ) !== null ) {
312
+ version = out . stdout . trim ( ) ;
311
313
tag = version ;
312
314
}
313
315
// ...otherwise, get the most recent stable tag
314
316
else {
315
317
var hash ;
316
318
317
319
// If there isn't one then just get the most recent tag, whatever it is
318
- version = shell . exec ( 'git rev-list --tags --max-count=1 | xargs git describe' , { silent :true } ) . output . trim ( ) ;
320
+ version = shell . exec ( 'git rev-list --tags --max-count=1 | xargs git describe' , { silent :true } ) . stdout . trim ( ) ;
319
321
320
322
// Get the short commit hash from the current commit to append to the most recent tag
321
- hash = shell . exec ( 'git rev-parse --short HEAD' , { silent :true } ) . output . trim ( ) ;
323
+ hash = shell . exec ( 'git rev-parse --short HEAD' , { silent :true } ) . stdout . trim ( ) ;
322
324
323
325
version = version + '-' + hash ;
324
326
@@ -333,7 +335,7 @@ var util = module.exports = {
333
335
getStableVersion : function ( ) {
334
336
var cmd = 'git log --date-order --graph --tags --simplify-by-decoration --pretty=format:\"%ai %h %d\"' ;
335
337
// grunt.log.writeln(cmd);
336
- var out = shell . exec ( cmd , { silent :true } ) . output ;
338
+ var out = shell . exec ( cmd , { silent :true } ) . stdout ;
337
339
338
340
// grunt.log.writeln(lines);
339
341
0 commit comments