From 85a238b75e051c9e3c862652bb543f99583f2a0e Mon Sep 17 00:00:00 2001
From: Leonty Chudinov <lchudinov@rocketsoftware.com>
Date: Mon, 24 Jan 2022 10:35:54 +0500
Subject: [PATCH] Allow to use yaml config for install-app script

Signed-off-by: Leonty Chudinov <lchudinov@rocketsoftware.com>
---
 utils/install-app.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/utils/install-app.js b/utils/install-app.js
index 18d879a1..e68ff63f 100644
--- a/utils/install-app.js
+++ b/utils/install-app.js
@@ -15,6 +15,8 @@ const packagingUtils = require('./packaging-utils');
 const serverUtils = require('../lib/util');
 const jsonUtils = require('../lib/jsonUtils');
 const rmrf = require('rimraf');
+const yamlConfig = require('./yamlConfig');
+
 
 //assuming that this is file isnt being called from another that is already using the logger... else expect strange logs
 //TO DO - Sean - bootstrap logger
@@ -67,13 +69,15 @@ if(calledViaCLI){
     pluginsDir = serverUtils.normalizePath(userInput.pluginsDir); 
   } else {
     userInput.zluxConfig = serverUtils.normalizePath(userInput.zluxConfig);
-    const zluxConfig = jsonUtils.parseJSONWithComments(userInput.zluxConfig);
-    pluginsDir = serverUtils.normalizePath(
-      zluxConfig.pluginsDir,
-      process.cwd());
-    if (!path.isAbsolute(pluginsDir)){
-      //zluxconfig paths relative to whereever that file is
-      path.normalize(userInput.zluxConfig,pluginsDir);
+    const zluxConfig = yamlConfig.getConfig(userInput.zluxConfig, undefined, ['app-server', 'zss']);
+    if (zluxConfig && typeof zluxConfig.pluginsDir === 'string') {
+      pluginsDir = serverUtils.normalizePath(
+        zluxConfig.pluginsDir,
+        process.cwd());
+      if (!path.isAbsolute(pluginsDir)){
+        //zluxconfig paths relative to whereever that file is
+        path.normalize(userInput.zluxConfig,pluginsDir);
+      }
     }
   }
   if (isFile(pluginsDir)) {