Comparing version 0.0.1 to 0.0.2
@@ -9,3 +9,3 @@ { | ||
], | ||
"version": "0.0.1", | ||
"version": "0.0.2", | ||
"repository": { | ||
@@ -31,2 +31,2 @@ "type": "git", | ||
"devDependencies": {} | ||
} | ||
} |
10
pub.js
@@ -30,3 +30,11 @@ // tpl - a general purpose template cli | ||
}; | ||
opt = append(defaultOpt, opt); | ||
var confOpt; | ||
try { | ||
confOpt = JSON.parse(fs.readFileSync(path.resolve(confdir, | ||
'conf.json'), 'utf8')); | ||
} catch (e) { | ||
confOpt = {}; | ||
} | ||
confOpt = append(defaultOpt, confOpt); | ||
opt = append(confOpt, opt); | ||
@@ -33,0 +41,0 @@ if (typeof files == 'string') |
4927
40