@@ -18,7 +18,7 @@ var requireCliAndRun = function(karmaPath) {
18
18
if ( process . argv . indexOf ( '--which' ) !== - 1 ) {
19
19
console . log ( karmaPath ) ;
20
20
} else {
21
- var karmaCli = require ( karmaPath + '/ lib/ cli') ;
21
+ var karmaCli = require ( path . join ( karmaPath , ' lib' , ' cli') ) ;
22
22
23
23
if ( karmaCli . run ) {
24
24
karmaCli . run ( ) ;
@@ -35,16 +35,16 @@ var karmaCliRun = function(karmaCli, karmaPath) {
35
35
36
36
switch ( config . cmd ) {
37
37
case 'start' :
38
- require ( karmaPath + '/ lib/ server') . start ( config ) ;
38
+ require ( path . join ( karmaPath , ' lib' , ' server') ) . start ( config ) ;
39
39
break ;
40
40
case 'run' :
41
- require ( karmaPath + '/ lib/ runner') . run ( config ) ;
41
+ require ( path . join ( karmaPath , ' lib' , ' runner') ) . run ( config ) ;
42
42
break ;
43
43
case 'init' :
44
- require ( karmaPath + '/ lib/ init') . init ( config ) ;
44
+ require ( path . join ( karmaPath , ' lib' , ' init') ) . init ( config ) ;
45
45
break ;
46
46
case 'completion' :
47
- require ( karmaPath + '/ lib/ completion') . completion ( config ) ;
47
+ require ( path . join ( karmaPath , ' lib' , ' completion') ) . completion ( config ) ;
48
48
break ;
49
49
}
50
50
} ;
@@ -53,13 +53,13 @@ var karmaCliRun = function(karmaCli, karmaPath) {
53
53
resolve ( 'karma' , { basedir : process . cwd ( ) } , function ( err , pathToKarma ) {
54
54
// There is a local version, let's use it.
55
55
if ( ! err ) {
56
- return requireCliAndRun ( pathToKarma . replace ( / \/ l i b \/ i n d e x \. j s / , '' ) ) ;
56
+ return requireCliAndRun ( pathToKarma . replace ( / ( \/ | \\ ) l i b ( \/ | \\ ) i n d e x \. j s / , '' ) ) ;
57
57
}
58
58
59
59
// We can't load a global one, since NODE_PATH is not defined.
60
60
if ( ! NODE_PATH ) {
61
61
// Let's try a siblink to karma-cli, that is a global module with NVM.
62
- var siblinkKarma = path . normalize ( __dirname + '/../../ karma') ;
62
+ var siblinkKarma = path . normalize ( path . join ( __dirname , '..' , '..' , ' karma') ) ;
63
63
if ( fs . existsSync ( siblinkKarma ) ) {
64
64
return requireCliAndRun ( siblinkKarma ) ;
65
65
}
@@ -75,7 +75,7 @@ resolve('karma', {basedir: process.cwd()}, function(err, pathToKarma) {
75
75
var globalKarma ;
76
76
77
77
while ( globalPaths . length ) {
78
- globalKarma = path . normalize ( globalPaths . shift ( ) + '/ karma') ;
78
+ globalKarma = path . normalize ( path . join ( globalPaths . shift ( ) , ' karma') ) ;
79
79
if ( fs . existsSync ( globalKarma ) ) {
80
80
return requireCliAndRun ( globalKarma ) ;
81
81
}
0 commit comments