From 3b124a993bfcb9e7799bef59c50055bd99f02482 Mon Sep 17 00:00:00 2001
From: Alice Gaudon <alice@gaudon.pro>
Date: Thu, 3 Sep 2020 12:58:07 +0200
Subject: [PATCH] main.ts: fix config path order

---
 package.json | 2 +-
 src/main.ts  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 9135767..f108311 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "test": "jest --verbose --runInBand",
     "dist-webpack": "webpack --mode production",
-    "dist": "(test ! -d dist || rm -r dist) && tsc && npm run dist-webpack && mkdir -p dist/core-config && cp -r node_modules/wms-core/config/* dist/core-config/",
+    "dist": "(test ! -d dist || rm -r dist) && tsc && npm run dist-webpack",
     "dev": "concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
     "start": "yarn dist && node dist/main.js"
   },
diff --git a/src/main.ts b/src/main.ts
index 17025eb..b3f32d5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,14 +1,16 @@
 // Load config from specified path or default + wms-core/config (default defaults)
 process.env['NODE_CONFIG_DIR'] =
-    (process.env['NODE_CONFIG_DIR'] || './config/')
+    __dirname + '/../node_modules/wms-core/config/'
     + require('path').delimiter
-    + __dirname + '/core-config/';
+    + (process.env['NODE_CONFIG_DIR'] || __dirname + '/../config/');
 
 import Logger from "wms-core/Logger";
 import App from "./App";
 import config from "config";
 
 (async () => {
+    Logger.debug('Config path:', process.env['NODE_CONFIG_DIR']);
+
     const app = new App(config.get<number>('port'));
     await app.start();
 })().catch(err => {