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

Commit

Permalink
fix: Use path.join() to make it run on Windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
c0bra authored and vojtajina committed Dec 22, 2013
1 parent ad3f4ae commit 0534629
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions bin/karma
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var requireCliAndRun = function(karmaPath) {
if (process.argv.indexOf('--which') !== -1) {
console.log(karmaPath);
} else {
var karmaCli = require(karmaPath + '/lib/cli');
var karmaCli = require(path.join(karmaPath, 'lib', 'cli'));

if (karmaCli.run) {
karmaCli.run();
Expand All @@ -35,16 +35,16 @@ var karmaCliRun = function(karmaCli, karmaPath) {

switch (config.cmd) {
case 'start':
require(karmaPath + '/lib/server').start(config);
require(path.join(karmaPath, 'lib', 'server')).start(config);
break;
case 'run':
require(karmaPath + '/lib/runner').run(config);
require(path.join(karmaPath, 'lib', 'runner')).run(config);
break;
case 'init':
require(karmaPath + '/lib/init').init(config);
require(path.join(karmaPath, 'lib', 'init')).init(config);
break;
case 'completion':
require(karmaPath + '/lib/completion').completion(config);
require(path.join(karmaPath, 'lib', 'completion')).completion(config);
break;
}
};
Expand All @@ -53,13 +53,13 @@ var karmaCliRun = function(karmaCli, karmaPath) {
resolve('karma', {basedir: process.cwd()}, function(err, pathToKarma) {
// There is a local version, let's use it.
if (!err) {
return requireCliAndRun(pathToKarma.replace(/\/lib\/index\.js/, ''));
return requireCliAndRun(pathToKarma.replace(/(\/|\\)lib(\/|\\)index\.js/, ''));
}

// We can't load a global one, since NODE_PATH is not defined.
if (!NODE_PATH) {
// Let's try a siblink to karma-cli, that is a global module with NVM.
var siblinkKarma = path.normalize(__dirname + '/../../karma');
var siblinkKarma = path.normalize(path.join(__dirname, '..', '..', 'karma'));
if (fs.existsSync(siblinkKarma)) {
return requireCliAndRun(siblinkKarma);
}
Expand All @@ -75,7 +75,7 @@ resolve('karma', {basedir: process.cwd()}, function(err, pathToKarma) {
var globalKarma;

while (globalPaths.length) {
globalKarma = path.normalize(globalPaths.shift() + '/karma');
globalKarma = path.normalize(path.join(globalPaths.shift(), 'karma'));
if (fs.existsSync(globalKarma)) {
return requireCliAndRun(globalKarma);
}
Expand Down

0 comments on commit 0534629

Please sign in to comment.