diff --git a/plugins/c9.static/build.js b/plugins/c9.static/build.js index 8cc33f6b..47145eba 100644 --- a/plugins/c9.static/build.js +++ b/plugins/c9.static/build.js @@ -57,22 +57,24 @@ function main(options, imports, register) { }); return { config: plugins }; } - - if (config[0] != "/") - config = path.join(__dirname, "/../../configs/ide/" + config); - - if (config.slice(-3) !== ".js") - config += ".js"; - - var settings; - try { - settings = require("../../settings/standalone"); - config = require(config); - } catch (e) { - if (e.code == "MODULE_NOT_FOUND") - e = new error.NotFound(); - return { error: e }; + var err; + function tryPath(filePath, prefix) { + if (filePath.slice(-3) !== ".js") + filePath += ".js"; + if (filePath[0] !== "/") + filePath = path.join(__dirname, "/../../", prefix + filePath); + try { + return require(filePath); + } catch (e) { + if (e.code == "MODULE_NOT_FOUND") + e = new error.NotFound("Settings"); + err = e; + } } + var settings = tryPath("settings/standalone", ""); + config = tryPath(config, "configs/ide/") || tryPath(config, "configs/client-"); + if (!config || !settings && err) + return { error: err }; settings = settings(); settings.packaging = true; return { config: config(settings) }; diff --git a/plugins/c9.static/cdn.cli.js b/plugins/c9.static/cdn.cli.js index 85f42d2c..5bc10999 100644 --- a/plugins/c9.static/cdn.cli.js +++ b/plugins/c9.static/cdn.cli.js @@ -153,6 +153,7 @@ define(function(require, exports, module) { function done(err) { if (err) { console.error(err, err.stack); + console.trace(); process.exit(1); } pending--;