From 9c27dd4fcad1cf5841f5b01a97d437523c00a615 Mon Sep 17 00:00:00 2001
From: Bozhidar <bobi@microweber.com>
Date: Fri, 26 Apr 2024 22:08:26 +0300
Subject: [PATCH] update

---
 web/Modules/Docker/shell-scripts/install-docker.sh | 8 +++++---
 web/app/Filament/Pages/Modules.php                 | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/Modules/Docker/shell-scripts/install-docker.sh b/web/Modules/Docker/shell-scripts/install-docker.sh
index 264f6e5..4621136 100644
--- a/web/Modules/Docker/shell-scripts/install-docker.sh
+++ b/web/Modules/Docker/shell-scripts/install-docker.sh
@@ -1,5 +1,5 @@
-sudo apt-get update
-sudo apt-get install ca-certificates curl
+sudo apt-get update -y
+sudo apt-get install ca-certificates curl -y
 sudo install -m 0755 -d /etc/apt/keyrings
 sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
 sudo chmod a+r /etc/apt/keyrings/docker.asc
@@ -11,4 +11,6 @@ echo \
   sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt-get update
 
-sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
+
+echo "Done!"
diff --git a/web/app/Filament/Pages/Modules.php b/web/app/Filament/Pages/Modules.php
index be8aa95..a61a0c5 100644
--- a/web/app/Filament/Pages/Modules.php
+++ b/web/app/Filament/Pages/Modules.php
@@ -71,7 +71,7 @@ class Modules extends Page
             $this->installLog = str_replace("\n", "<br>", $this->installLog);
         }
 
-        if (Str::contains($this->installLog, 'Installed')) {
+        if (Str::contains($this->installLog, 'Done')) {
             $this->installLogPulling = false;
             $newModule = new Module();
             $newModule->name = $module;
@@ -87,7 +87,7 @@ class Modules extends Page
         $this->installLogPulling = true;
         $this->installLogFilePath = storage_path('logs/' . $module . '-install.log');
 
-        file_put_contents($this->installLogFilePath, 'Installing ' . $module . '...');
+        file_put_contents($this->installLogFilePath, 'Installing ' . $module . '...' . PHP_EOL);
 
         $postInstall = app()->make('Modules\\' . $module . '\\PostInstall');
         if (method_exists($postInstall, 'run')) {