From 76d090febfb0495784448d15153ac46c68c23d71 Mon Sep 17 00:00:00 2001
From: stasbilay02 <stasbilay02@yandex.ru>
Date: Wed, 23 Oct 2024 15:03:06 +0300
Subject: [PATCH] some fix

---
 .../console/controllers/KernelController.php  | 64 +++++++++++--------
 .../controllers/SecureRestController.php      |  2 +-
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/kernel/console/controllers/KernelController.php b/kernel/console/controllers/KernelController.php
index 8389b65..c59d7f4 100644
--- a/kernel/console/controllers/KernelController.php
+++ b/kernel/console/controllers/KernelController.php
@@ -26,39 +26,43 @@ class KernelController extends ConsoleController
         }
 
         if (file_exists(ROOT_DIR . $this->argv['path'])) {
-            $tmpKernelDirFull = RESOURCES_DIR . '/tmp/ad/app/kernel';
+            $tmpKernelDirFull = RESOURCES_DIR . '/tmp/ad/kernel/kernel';
             $this->files->copy_folder(KERNEL_DIR, $tmpKernelDirFull);
             $this->out->r("Ядро скопировано во временную папку", 'green');
         } else {
             $this->out->r("Ядро не найдено", 'red');
         }
 
-        if (isset($this->argv['bootstrap'])) {
-            if (file_exists(ROOT_DIR . '/bootstrap')) {
-                $tmpBootstrapDirFull = RESOURCES_DIR . '/tmp/ad/app/bootstrap';
-                $this->files->copy_folder(ROOT_DIR . '/bootstrap', $tmpBootstrapDirFull);
-                $this->out->r("/bootstrap скопирован во временную папку", 'green');
-            } else {
-                $this->out->r("/bootstrap не найден", 'red');
-            }
+        if (file_exists(ROOT_DIR . '/bootstrap')) {
+            $tmpBootstrapDirFull = RESOURCES_DIR . '/tmp/ad/kernel/bootstrap';
+            $this->files->copy_folder(ROOT_DIR . '/bootstrap', $tmpBootstrapDirFull);
+            $this->out->r("/bootstrap скопирован во временную папку", 'green');
+        } else {
+            $this->out->r("/bootstrap не найден", 'red');
         }
 
-        if (isset($this->argv['.env'])) {
-            if (file_exists(ROOT_DIR . '/.env.example')) {
-                $tmpEnvFull = RESOURCES_DIR . '/tmp/ad/app/env.example';
-               copy(ROOT_DIR . '/.env.example', $tmpEnvFull);
-                $this->out->r("/.env.example скопирован во временную папку", 'green');
-            } else {
-                $this->out->r("/.env.example не найден", 'red');
-            }
+        if (file_exists(ROOT_DIR . '/.env.example')) {
+            $tmpEnvDirFull = RESOURCES_DIR . '/tmp/ad/kernel/env.example';
+            copy(ROOT_DIR . '/.env.example', $tmpEnvDirFull);
+            $this->out->r("/.env.example скопирован во временную папку", 'green');
+        } else {
+            $this->out->r("/.env.example не найден", 'red');
+        }
+
+        if (file_exists(ROOT_DIR . '/composer.json')) {
+            $tmpComposerDirFull = RESOURCES_DIR . '/tmp/ad/kernel/composer.json';
+            copy(ROOT_DIR . '/composer.json', $tmpComposerDirFull);
+            $this->out->r("/composer.json скопирован во временную папку", 'green');
+        } else {
+            $this->out->r("/composer.json не найден", 'red');
         }
 
         if (!is_dir(RESOURCES_DIR . '/tmp/app')) {
             mkdir(RESOURCES_DIR . '/tmp/app');
         }
 
-        $this->files->pack(RESOURCES_DIR . '/tmp/ad/app/', RESOURCES_DIR . '/tmp/app/app.iga');
-        $this->files->recursiveRemoveDir(RESOURCES_DIR . '/tmp/ad/app/');
+        $this->files->pack(RESOURCES_DIR . '/tmp/ad/kernel/', RESOURCES_DIR . '/tmp/kernel/kernel.igk');
+        $this->files->recursiveRemoveDir(RESOURCES_DIR . '/tmp/ad/kernel/');
     }
 
     /**
@@ -72,26 +76,30 @@ class KernelController extends ConsoleController
 
         $zip = new ZipArchive;
         if (file_exists(ROOT_DIR . $this->argv['path'])) {
-            $tmpAppDir = md5(time());
+            $tmpKernelDir = md5(time());
             $res = $zip->open(ROOT_DIR . $this->argv['path']);
             if ($res === TRUE) {
-                $tmpAppDirFull = RESOURCES_DIR . '/tmp/app/' . $tmpAppDir . "/";
-                $zip->extractTo($tmpAppDirFull);
+                $tmpKernelDirFull = RESOURCES_DIR . '/tmp/kernel/' . $tmpKernelDir . "/";
+                $zip->extractTo($tmpKernelDirFull);
                 $zip->close();
                 $this->files->recursiveRemoveKernelDir();
-                $this->files->copy_folder($tmpAppDirFull . 'kernel' , ROOT_DIR . "/kernel");
+                $this->files->copy_folder($tmpKernelDirFull . 'kernel' , ROOT_DIR . "/kernel");
 
                 if (isset($this->argv['bootstrap'])) {
                     $this->files->recursiveRemoveDir(ROOT_DIR . '/bootstrap');
-                    $this->files->copy_folder($tmpAppDirFull . 'bootstrap' , ROOT_DIR . '/bootstrap');
+                    $this->files->copy_folder($tmpKernelDirFull . 'bootstrap' , ROOT_DIR . '/bootstrap');
                 }
 
-                if (isset($this->argv['.env'])) {
-                    copy($tmpAppDirFull . 'env.example', ROOT_DIR . '/.env.example');
+                if (isset($this->argv['env'])) {
+                    copy($tmpKernelDirFull . 'env.example', ROOT_DIR . '/.env.example');
                 }
 
-                $this->files->recursiveRemoveDir($tmpAppDirFull);
-                $this->out->r('Приложение обновлено.', 'green');
+                if (isset($this->argv['composer'])) {
+                    copy($tmpKernelDirFull . 'composer.json', ROOT_DIR . '/composer.json');
+                }
+
+                $this->files->recursiveRemoveDir($tmpKernelDirFull);
+                $this->out->r('Ядро обновлено.', 'green');
             } else {
                 $this->out->r('unable to open zip archive', 'red');
             }
diff --git a/kernel/modules/secure/controllers/SecureRestController.php b/kernel/modules/secure/controllers/SecureRestController.php
index d73e2fd..42ede4a 100644
--- a/kernel/modules/secure/controllers/SecureRestController.php
+++ b/kernel/modules/secure/controllers/SecureRestController.php
@@ -50,5 +50,5 @@ class SecureRestController extends RestController
         
         $this->renderApi($res);
     }
-    
+
 }
\ No newline at end of file