@@ -218,15 +218,12 @@ function gypfile (file, data, cb) {
218
218
return cb ( null , data )
219
219
}
220
220
221
- glob ( '*.gyp' , { cwd : dir } , function ( er , files ) {
222
- if ( er ) {
223
- return cb ( er )
224
- }
225
- if ( data . gypfile === false ) {
226
- return cb ( null , data )
227
- }
228
- gypfile_ ( file , data , files , cb )
229
- } )
221
+ if ( data . gypfile === false ) {
222
+ return cb ( null , data )
223
+ }
224
+ glob ( '*.gyp' , { cwd : dir } )
225
+ . then ( files => gypfile_ ( file , data , files , cb ) )
226
+ . catch ( er => cb ( er ) )
230
227
}
231
228
232
229
function gypfile_ ( file , data , files , cb ) {
@@ -246,22 +243,13 @@ function serverjs (file, data, cb) {
246
243
if ( s . start ) {
247
244
return cb ( null , data )
248
245
}
249
- glob ( 'server.js' , { cwd : dir } , function ( er , files ) {
250
- if ( er ) {
251
- return cb ( er )
246
+ fs . access ( path . join ( dir , 'server.js' ) , ( err ) => {
247
+ if ( ! err ) {
248
+ s . start = 'node server.js'
249
+ data . scripts = s
252
250
}
253
- serverjs_ ( file , data , files , cb )
254
- } )
255
- }
256
-
257
- function serverjs_ ( file , data , files , cb ) {
258
- if ( ! files . length ) {
259
251
return cb ( null , data )
260
- }
261
- var s = data . scripts || { }
262
- s . start = 'node server.js'
263
- data . scripts = s
264
- return cb ( null , data )
252
+ } )
265
253
}
266
254
267
255
function authors ( file , data , cb ) {
@@ -294,21 +282,20 @@ function readme (file, data, cb) {
294
282
}
295
283
var dir = path . dirname ( file )
296
284
var globOpts = { cwd : dir , nocase : true , mark : true }
297
- glob ( '{README,README.*}' , globOpts , function ( er , files ) {
298
- if ( er ) {
299
- return cb ( er )
300
- }
301
- // don't accept directories.
302
- files = files . filter ( function ( filtered ) {
303
- return ! filtered . match ( / \/ $ / )
285
+ glob ( '{README,README.*}' , globOpts )
286
+ . then ( files => {
287
+ // don't accept directories.
288
+ files = files . filter ( function ( filtered ) {
289
+ return ! filtered . match ( / \/ $ / )
290
+ } )
291
+ if ( ! files . length ) {
292
+ return cb ( )
293
+ }
294
+ var fn = preferMarkdownReadme ( files )
295
+ var rm = path . resolve ( dir , fn )
296
+ return readme_ ( file , data , rm , cb )
304
297
} )
305
- if ( ! files . length ) {
306
- return cb ( )
307
- }
308
- var fn = preferMarkdownReadme ( files )
309
- var rm = path . resolve ( dir , fn )
310
- readme_ ( file , data , rm , cb )
311
- } )
298
+ . catch ( er => cb ( er ) )
312
299
}
313
300
314
301
function preferMarkdownReadme ( files ) {
@@ -346,15 +333,14 @@ function mans (file, data, cb) {
346
333
}
347
334
const dirname = path . dirname ( file )
348
335
cwd = path . resolve ( path . dirname ( file ) , cwd )
349
- glob ( '**/*.[0-9]' , { cwd } , function ( er , mansGlob ) {
350
- if ( er ) {
351
- return cb ( er )
352
- }
353
- data . man = mansGlob . map ( man =>
354
- path . relative ( dirname , path . join ( cwd , man ) ) . split ( path . sep ) . join ( '/' )
355
- )
356
- return cb ( null , data )
357
- } )
336
+ glob ( '**/*.[0-9]' , { cwd } )
337
+ . then ( mansGlob => {
338
+ data . man = mansGlob . map ( man =>
339
+ path . relative ( dirname , path . join ( cwd , man ) ) . split ( path . sep ) . join ( '/' )
340
+ )
341
+ return cb ( null , data )
342
+ } )
343
+ . catch ( er => cb ( er ) )
358
344
}
359
345
360
346
function bins ( file , data , cb ) {
@@ -366,12 +352,9 @@ function bins (file, data, cb) {
366
352
}
367
353
368
354
m = path . resolve ( path . dirname ( file ) , m )
369
- glob ( '**' , { cwd : m } , function ( er , binsGlob ) {
370
- if ( er ) {
371
- return cb ( er )
372
- }
373
- bins_ ( file , data , binsGlob , cb )
374
- } )
355
+ glob ( '**' , { cwd : m } )
356
+ . then ( binsGlob => bins_ ( file , data , binsGlob , cb ) )
357
+ . catch ( er => cb ( er ) )
375
358
}
376
359
377
360
function bins_ ( file , data , binsGlob , cb ) {
0 commit comments