| commit | 309e7e4a3f8deda954bdbc346908be8b46f63f4d | [log] [tgz] |
|---|---|---|
| author | Patrick Mueller <pmuellr@apache.org> | Mon Feb 20 23:32:03 2012 -0500 |
| committer | Patrick Mueller <pmuellr@apache.org> | Mon Feb 20 23:32:03 2012 -0500 |
| tree | 6f5b9b6bb7b70f828598778f67798f73201f52f9 | |
| parent | 4eae8a17333134fed611fe14ccc40854277f5c9b [diff] | |
| parent | 23e971f1beb3c2931f630681e80f02fb1642fc27 [diff] |
Merge branch 'master' of https://github.com/fenghaitao/incubator-cordova-weinre into issue-266
diff --git a/weinre.server/lib/cli.coffee b/weinre.server/lib/cli.coffee index 2598c68..f34ddeb 100644 --- a/weinre.server/lib/cli.coffee +++ b/weinre.server/lib/cli.coffee
@@ -104,7 +104,7 @@ properties = {} fileName = replaceTilde '~/.weinre/server.properties' - return options if !path.existsSync(fileName) + return properties if !path.existsSync(fileName) contents = fs.readFileSync(fileName, 'utf8') lines = contents.split('\n')