Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit 0534629

Browse files
c0bravojtajina
authored andcommitted
fix: Use path.join() to make it run on Windows.
1 parent ad3f4ae commit 0534629

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

bin/karma

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var requireCliAndRun = function(karmaPath) {
1818
if (process.argv.indexOf('--which') !== -1) {
1919
console.log(karmaPath);
2020
} else {
21-
var karmaCli = require(karmaPath + '/lib/cli');
21+
var karmaCli = require(path.join(karmaPath, 'lib', 'cli'));
2222

2323
if (karmaCli.run) {
2424
karmaCli.run();
@@ -35,16 +35,16 @@ var karmaCliRun = function(karmaCli, karmaPath) {
3535

3636
switch (config.cmd) {
3737
case 'start':
38-
require(karmaPath + '/lib/server').start(config);
38+
require(path.join(karmaPath, 'lib', 'server')).start(config);
3939
break;
4040
case 'run':
41-
require(karmaPath + '/lib/runner').run(config);
41+
require(path.join(karmaPath, 'lib', 'runner')).run(config);
4242
break;
4343
case 'init':
44-
require(karmaPath + '/lib/init').init(config);
44+
require(path.join(karmaPath, 'lib', 'init')).init(config);
4545
break;
4646
case 'completion':
47-
require(karmaPath + '/lib/completion').completion(config);
47+
require(path.join(karmaPath, 'lib', 'completion')).completion(config);
4848
break;
4949
}
5050
};
@@ -53,13 +53,13 @@ var karmaCliRun = function(karmaCli, karmaPath) {
5353
resolve('karma', {basedir: process.cwd()}, function(err, pathToKarma) {
5454
// There is a local version, let's use it.
5555
if (!err) {
56-
return requireCliAndRun(pathToKarma.replace(/\/lib\/index\.js/, ''));
56+
return requireCliAndRun(pathToKarma.replace(/(\/|\\)lib(\/|\\)index\.js/, ''));
5757
}
5858

5959
// We can't load a global one, since NODE_PATH is not defined.
6060
if (!NODE_PATH) {
6161
// 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'));
6363
if (fs.existsSync(siblinkKarma)) {
6464
return requireCliAndRun(siblinkKarma);
6565
}
@@ -75,7 +75,7 @@ resolve('karma', {basedir: process.cwd()}, function(err, pathToKarma) {
7575
var globalKarma;
7676

7777
while (globalPaths.length) {
78-
globalKarma = path.normalize(globalPaths.shift() + '/karma');
78+
globalKarma = path.normalize(path.join(globalPaths.shift(), 'karma'));
7979
if (fs.existsSync(globalKarma)) {
8080
return requireCliAndRun(globalKarma);
8181
}

0 commit comments

Comments
 (0)