Updated Branches: refs/heads/fauxton 7c969a124 -> 18ea4df42
check for settings.json or settings.json.default when reading settings file. Resolves COUCHDB-1703 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/18ea4df4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/18ea4df4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/18ea4df4 Branch: refs/heads/fauxton Commit: 18ea4df42f943c5ccd2a5ed747d30a9f638a53fd Parents: 7c969a1 Author: Garren Smith <[email protected]> Authored: Wed Mar 13 23:22:22 2013 +0200 Committer: Garren Smith <[email protected]> Committed: Wed Mar 13 23:22:22 2013 +0200 ---------------------------------------------------------------------- src/fauxton/grunt.js | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/18ea4df4/src/fauxton/grunt.js ---------------------------------------------------------------------- diff --git a/src/fauxton/grunt.js b/src/fauxton/grunt.js index 9dc7ddb..ca10c8e 100644 --- a/src/fauxton/grunt.js +++ b/src/fauxton/grunt.js @@ -14,13 +14,20 @@ module.exports = function(grunt) { } }; - function processAddons(callback){ - if (path.existsSync("settings.json")){ - var settings = grunt.file.readJSON("settings.json") || {deps: []}; - settings.deps.forEach(callback); + function readSettingsFile () { + if (path.existsSync("settings.json")) { + return grunt.file.readJSON("settings.json") + } else if (path.existsSync("settings.json.default")) { + return grunt.file.readJSON("settings.json.default") + } else { + return {deps: []}; } } + function processAddons(callback){ + readSettingsFile().deps.forEach(callback); + } + var cleanable = function(){ // Whitelist files and directories to be cleaned
