From 927c7ab61e63896ab4efc236a9cec1d4ba0b2299 Mon Sep 17 00:00:00 2001
From: ivanovEV <ivanovev@melonfashion.com>
Date: Thu, 18 Jan 2024 16:03:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jenkins/library/steps/GetExtensions.groovy       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
index 97915ddd..004526fd 100644
--- a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
@@ -23,13 +23,15 @@ class GetExtensions implements Serializable {
 
     def run() {
         IStepExecutor steps = ContextRegistry.getContext().getStepExecutor()
+        def env = steps.env();
 
         Logger.printLocation()
 
         steps.installLocalDependencies();
 
+
         String vrunnerPath = initVRunnerPath();
-        String srcDir = getSrcDir();
+        String srcDir = getSrcDir(env);
 
         Logger.println("Сборка расширений")
 
@@ -39,7 +41,7 @@ class GetExtensions implements Serializable {
                 buildExtension(it, srcDir, vrunnerPath)
             } else {
                 Logger.println("Загрузка расширения ${it.name} из интернета по ссылке ${it.path}")
-                loadExtension(it)
+                loadExtension(it, env)
             }
         }
     }
@@ -55,7 +57,7 @@ class GetExtensions implements Serializable {
         }
     }
 
-    private void loadExtension(Extension extension) {
+    private void loadExtension(Extension extension, def env) {
         String pathToExtension = "$env.WORKSPACE/${EXTENSIONS_OUT_DIR}/${extension.name}.cfe"
         FilePath localPathToExtension = FileUtils.getFilePath(pathToExtension)
         localPathToExtension.copyFrom(new URL(extension.path))
@@ -66,10 +68,8 @@ class GetExtensions implements Serializable {
         return VRunner.getVRunnerPath()
     }
 
-    private String getSrcDir() {
+    private String getSrcDir(def env) {
         if (config.sourceFormat == SourceFormat.EDT) {
-            def env = steps.env();
-
             sourceDirName = "$env.WORKSPACE/$EdtToDesignerFormatTransformation.EXTENSION_DIR"
             // распакуем расширения
             steps.unstash(EdtToDesignerFormatTransformation.EXTENSION_ZIP_STASH)