Merge pull request girder#622 from girder/grunt-readServerConfig

Fix a Grunt failure when no "server" section is defined in the local config
Xarthisius · Jan 15, 2015 · 0c1095d · 0c1095d
2 parents 10cebf1 + 4e821ff
commit 0c1095d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -33,8 +33,8 @@ module.exports = function (grunt) {
         }
         try {
             var cfg = JSON.parse(stdout);
-            apiRoot = (cfg.server.api_root || '/api/v1').replace(/\"/g, "");
-            staticRoot = (cfg.server.static_root || '/static').replace(/\"/g, "");
+            apiRoot = ((cfg.server && cfg.server.api_root) || '/api/v1').replace(/\"/g, "");
+            staticRoot = ((cfg.server && cfg.server.static_root) || '/static').replace(/\"/g, "");
             console.log('Static root: ' + staticRoot.bold);
             console.log('API root: ' + apiRoot.bold);
         }