verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2446-ticket_index_overlap_ref_and_state
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-09-14 13:58:53 +02:00
parent 13a5c4c4c9 652812bca4
commit f7a5b4bdce
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
print/core/config.js
View File

@ -13,14 +13,15 @@ let configFiles = [
]; ];
for (let configFile of configFiles) { for (let configFile of configFiles) {
const filePath = path.join(__dirname, configFile); if (!configFile.includes(configPath))
if (fs.existsSync(filePath)) { configFile = path.join(__dirname, configFile);
const conf = require(filePath);
if (fs.existsSync(configFile)) {
const conf = require(configFile);
for (let prop in conf) for (let prop in conf)
Object.assign(config[prop], conf[prop]); Object.assign(config[prop], conf[prop]);
} }
} }
config.env = env; config.env = env;
module.exports = config; module.exports = config;