不要怂,就是干,撸起袖子干!

Commit 55616c2d by Anh-Kiet Ngo

Updated the way relative paths are checked

1 parent 6652ef62
Showing with 12 additions and 3 deletions
...@@ -22,6 +22,15 @@ var relativeConfigFile = function() { ...@@ -22,6 +22,15 @@ var relativeConfigFile = function() {
return path.relative(process.cwd(), configuration.configFile) return path.relative(process.cwd(), configuration.configFile)
} }
// Taken from
// http://stackoverflow.com/questions/15375544/how-can-i-robustly-detect-a-relative-path-in-node-js/17521358#17521358
var isRelativePath = function(p) {
var normal = path.normalize(p)
, absolute = path.resolve(p);
return normal != absolute;
}
var writeDefaultConfig = function(config) { var writeDefaultConfig = function(config) {
var configPath = path.dirname(configuration.configFile) var configPath = path.dirname(configuration.configFile)
...@@ -109,10 +118,10 @@ program ...@@ -109,10 +118,10 @@ program
.parse(process.argv) .parse(process.argv)
if(typeof program.config === 'string') { if(typeof program.config === 'string') {
if (program.config[0] === '/') { if (isRelativePath(program.config)) {
configuration.configFile = program.config
} else {
configuration.configFile = path.join(process.cwd(), program.config); configuration.configFile = path.join(process.cwd(), program.config);
} else {
configuration.configFile = program.config
} }
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!