fix workflow build

pull/402/head
nightwing 2017-02-17 07:06:08 +00:00
rodzic 9dc06f263d
commit d607cf5f5d
2 zmienionych plików z 18 dodań i 15 usunięć

Wyświetl plik

@ -57,22 +57,24 @@ function main(options, imports, register) {
}); });
return { config: plugins }; return { config: plugins };
} }
var err;
if (config[0] != "/") function tryPath(filePath, prefix) {
config = path.join(__dirname, "/../../configs/ide/" + config); if (filePath.slice(-3) !== ".js")
filePath += ".js";
if (config.slice(-3) !== ".js") if (filePath[0] !== "/")
config += ".js"; filePath = path.join(__dirname, "/../../", prefix + filePath);
try {
var settings; return require(filePath);
try { } catch (e) {
settings = require("../../settings/standalone"); if (e.code == "MODULE_NOT_FOUND")
config = require(config); e = new error.NotFound("Settings");
} catch (e) { err = e;
if (e.code == "MODULE_NOT_FOUND") }
e = new error.NotFound();
return { error: 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 = settings();
settings.packaging = true; settings.packaging = true;
return { config: config(settings) }; return { config: config(settings) };

Wyświetl plik

@ -153,6 +153,7 @@ define(function(require, exports, module) {
function done(err) { function done(err) {
if (err) { if (err) {
console.error(err, err.stack); console.error(err, err.stack);
console.trace();
process.exit(1); process.exit(1);
} }
pending--; pending--;