From 48171235992c142a782016152def9915d8d5f906 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Fri, 7 Oct 2022 19:19:55 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/createWebApp.js |  9 +++++++++
 server/index.js        | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/server/createWebApp.js b/server/createWebApp.js
index 705f18c..1a02eb5 100644
--- a/server/createWebApp.js
+++ b/server/createWebApp.js
@@ -41,4 +41,13 @@ module.exports = async(config) => {
 
     await fs.writeFile(verFile, config.version);
     await fs.remove(zipFile);
+
+    //rename app_new
+    const webAppDir = `${config.publicDir}/app`;
+    const appNewDir = `${config.publicDir}/app_new`;
+    if (await fs.pathExists(appNewDir)) {
+        await fs.remove(webAppDir);
+        await fs.move(appNewDir, webAppDir);
+    }
+
 };
\ No newline at end of file
diff --git a/server/index.js b/server/index.js
index 3d83d63..51f63f8 100644
--- a/server/index.js
+++ b/server/index.js
@@ -57,12 +57,6 @@ async function init() {
     await appLogger.init(config);
     log = appLogger.log;
 
-    //web app
-    if (branch !== 'development') {
-        const createWebApp = require('./createWebApp');
-        await createWebApp(config);
-    }
-
     //cli
     if (argv.help) {
         showHelp();
@@ -116,6 +110,12 @@ async function init() {
     config.recreateDb = argv.recreate || false;
     config.inpxFilterFile = `${config.execDir}/inpx-web-filter.json`;
     config.allowUnsafeFilter = argv['unsafe-filter'] || false;
+
+    //web app
+    if (branch !== 'development') {
+        const createWebApp = require('./createWebApp');
+        await createWebApp(config);
+    }
 }
 
 async function main() {