From 0ea1e3f8378d479ef1bc8a86de1e2f3d8eb25dff Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 4 Jan 2019 18:26:10 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9=20=D0=BA=20=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config/base.js       | 12 +++++++-----
 server/config/production.js |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/server/config/base.js b/server/config/base.js
index 77cffd0e..b9a7cd8a 100644
--- a/server/config/base.js
+++ b/server/config/base.js
@@ -1,13 +1,15 @@
 const path = require('path');
 const pckg = require('../../package.json');
-const execPath = path.resolve(__dirname, '..');
+
+const execDir = path.resolve(__dirname, '..');
+const dataDir = `${execDir}/data`;
 
 module.exports = {
     branch: 'base',
-    tempDir: execPath + '/tmp',
-    logDir: execPath + '/log',
-    dataDir: execPath + '/data',
-    publicDir: execPath + '/public',
+    dataDir: dataDir,
+    tempDir: `${dataDir}/tmp`,
+    logDir: `${dataDir}/log`,
+    publicDir: `${execDir}/public`,
     dbFileName: 'db.sqlite',
     loggingEnabled: true,
 
diff --git a/server/config/production.js b/server/config/production.js
index 42422703..f38a92bd 100644
--- a/server/config/production.js
+++ b/server/config/production.js
@@ -2,12 +2,13 @@ const path = require('path');
 const base = require('./base');
 
 const execPath = path.dirname(process.execPath);
+const dataDir = `${execDir}/data`;
 
 module.exports = Object.assign({}, base, {
         branch: 'production',
-        tempDir: execPath + '/tmp',
-        logDir: execPath + '/log',
-        dataDir: execPath + '/data',
-        publicDir: execPath + '/public',
+        dataDir: dataDir,
+        tempDir: `${dataDir}/tmp`,
+        logDir: `${dataDir}/log`,
+        publicDir: `${execDir}/public`,
     }
 );