File tree 2 files changed +5
-6
lines changed
2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ var async = require('async')
5
5
var distros = require ( './os.json' )
6
6
var fs = require ( 'fs' )
7
7
var os = require ( 'os' )
8
- var path = require ( 'path' )
9
8
10
9
/**
11
10
* Begin definition of globals.
@@ -21,7 +20,7 @@ module.exports = function getOs (cb) {
21
20
// Linux is a special case.
22
21
if ( osName === 'linux' ) return getLinuxDistro ( cb )
23
22
// Else, node's builtin is acceptable.
24
- return cb ( null , { 'os' : osName } )
23
+ return cb ( null , { 'os' : osName } )
25
24
}
26
25
27
26
/**
@@ -121,7 +120,7 @@ function getName (candidate) {
121
120
* Loads a custom logic module to populate additional distribution information
122
121
*/
123
122
function customLogic ( os , name , file , cb ) {
124
- var logic = './logic/' + name + '.js' ;
123
+ var logic = './logic/' + name + '.js'
125
124
try { require ( logic ) ( os , file , cb ) } catch ( e ) { cb ( null , os ) }
126
125
}
127
126
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ distros.forEach(function (v1) {
27
27
// Build the docker image using the dockerfile
28
28
process . stdout . write ( 'Building version ' + v2 + ' of ' + capitalize ( v1 ) + '... ' )
29
29
try {
30
- var dockerResult = execSync ( 'docker build -t "getos:' + v1 + v2 + '" .' , { stdio : [ ] } )
30
+ var dockerResult = execSync ( 'docker build -t "getos:' + v1 + v2 + '" .' , { stdio : [ ] } )
31
31
} catch ( e ) {
32
32
dockerResult = dockerResult || { }
33
33
dockerResult . code = e
@@ -40,7 +40,7 @@ distros.forEach(function (v1) {
40
40
process . stdout . write ( 'Running container... ' )
41
41
// Show output from distribution
42
42
try {
43
- var nodeResult = execSync ( 'docker run -d getos:' + v1 + v2 , { stdio : [ ] } )
43
+ var nodeResult = execSync ( 'docker run -d getos:' + v1 + v2 , { stdio : [ ] } )
44
44
} catch ( e ) {
45
45
nodeResult = nodeResult || { }
46
46
nodeResult . code = e
@@ -50,7 +50,7 @@ distros.forEach(function (v1) {
50
50
process . stdout . write ( '[' + color . red ( 'FAILED!' ) + ']\n' )
51
51
} else {
52
52
try {
53
- var dockerLog = execSync ( 'sleep 2s && docker logs ' + ( nodeResult . stdout || nodeResult . toString ( ) ) , { stdio : [ ] } )
53
+ var dockerLog = execSync ( 'sleep 2s && docker logs ' + ( nodeResult . stdout || nodeResult . toString ( ) ) , { stdio : [ ] } )
54
54
} catch ( e ) {
55
55
dockerLog = dockerLog || { }
56
56
dockerLog . code = e
You can’t perform that action at this time.
0 commit comments