Merge branch 'current' of https://github.com/wukko/cobalt into current

This commit is contained in:
wukko 2023-07-14 22:20:12 +06:00
commit ccab047f19

View file

@ -24,9 +24,12 @@ app.disable('x-powered-by');
await loadLoc(); await loadLoc();
if (process.env.apiURL && process.env.apiPort && !((process.env.webURL && process.env.webPort) || (process.env.selfURL && process.env.port))) { const apiMode = process.env.apiURL && process.env.apiPort && !((process.env.webURL && process.env.webPort) || (process.env.selfURL && process.env.port))
const webMode = process.env.webURL && process.env.webPort && !((process.env.apiURL && process.env.apiPort) || (process.env.selfURL && process.env.port))
if (apiMode) {
runAPI(express, app, gitCommit, gitBranch, __dirname); runAPI(express, app, gitCommit, gitBranch, __dirname);
} else if (process.env.webURL && process.env.webPort && !((process.env.apiURL && process.env.apiPort) || (process.env.selfURL && process.env.port))) { } else if (webMode) {
await runWeb(express, app, gitCommit, gitBranch, __dirname); await runWeb(express, app, gitCommit, gitBranch, __dirname);
} else { } else {
console.log(Red(`cobalt wasn't configured yet or configuration is invalid.\n`) + Bright(`please run the setup script to fix this: `) + Green(`npm run setup`)); console.log(Red(`cobalt wasn't configured yet or configuration is invalid.\n`) + Bright(`please run the setup script to fix this: `) + Green(`npm run setup`));