From aee977ac3624bfe438452882d9eb4463e0db7630 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:05:46 +0300
Subject: [PATCH] installer ref

---
 install/core/tpl/index.tpl |  5 -----
 install/entry.php          | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/install/core/tpl/index.tpl b/install/core/tpl/index.tpl
index 5f331c16bb..774dca234e 100644
--- a/install/core/tpl/index.tpl
+++ b/install/core/tpl/index.tpl
@@ -7,11 +7,6 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
         {if $isBuilt}
-        <script type="text/javascript" src="../client/lib/espo-libs.min.js"></script>
-        <script type="text/javascript" src="../client/lib/espo-0.min.js"></script>
-        <script type="text/javascript" src="../client/lib/espo-1.min.js"></script>
-        <script type="text/javascript" src="../client/lib/espo-2.min.js"></script>
-        {else}
         {foreach from=$libFileList item=file}
         <script type="text/javascript" src="../{$file}"></script>
         {/foreach}
diff --git a/install/entry.php b/install/entry.php
index 76884def90..e9f54abf93 100644
--- a/install/entry.php
+++ b/install/entry.php
@@ -204,15 +204,15 @@ if (Utils::checkActionExists($action)) {
 
 if (!empty($actionFile) && file_exists('install/core/tpl/' . $tplName)) {
     /* check if EspoCRM is built */
-    $isBuilt = file_exists('client/lib/espo-0.min.js');
+    $isBuilt = file_exists('client/lib/espo-libs.min.js');
 
     $smarty->assign('isBuilt', $isBuilt);
 
-    if (!$isBuilt) {
-        $libListProvider = new DevModeJsFileListProvider(new FileManager());
+    $libFileList = $isBuilt ?
+        $installer->getMetadata()->get(['app', 'client', 'scriptList']) ?? [] :
+        (new DevModeJsFileListProvider(new FileManager()))->get();
 
-        $smarty->assign('libFileList', $libListProvider->get());
-    }
+    $smarty->assign('libFileList', $libFileList);
 
     $smarty->display('index.tpl');
 }