From c6d0cf6f408d9e99c99319cf3fcdbd2b661f5813 Mon Sep 17 00:00:00 2001
From: nikitadr <nikitadr@gmail.com>
Date: Thu, 17 Sep 2026 13:50:30 +0400
Subject: [PATCH] qwe

---
 lanit/script_1.sh | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/lanit/script_1.sh b/lanit/script_1.sh
index e2d2909..d3b3fa8 100644
--- a/lanit/script_1.sh
+++ b/lanit/script_1.sh
@@ -66,7 +66,20 @@ fi
 }
 
 merg_and_del() {
-echo "[Ok]"
+	if [ -d "$PWD/$userName/$alias/" ]
+	then
+		touch "$PWD/$userName/$alias/all_logs_$alias.log"
+		 find "$PWD/$userName/$alias/" -type f -name "*.log" \
+             -not -path "$PWD/$userName/$alias/all_logs_$alias.log" \
+             | sort | while IFS= read -r file; do
+			name=$(basename "$(dirname "$file")")
+      name="${name/Test/Test }"
+      echo "=====$name=====" >> "$PWD/$userName/$alias/all_logs_$alias.log"
+			cat "$file" >> "$PWD/$userName/$alias/all_logs_$alias.log"
+	done
+	rm -rf "$PWD/$userName/$alias/"Test*
+	fi
+echo "[Ok] Объединение log файлов и удаление артефактов тестирования завершено!"
 }
 
 if [ -z "$1" ];
@@ -105,12 +118,22 @@ then
 			Done="Yes"
 		fi
 	done
+else
+	name_config=$1
+	if [ -f "$name_config" ]
+		then
+			read_config "$name_config"
+		else
+			echo "[ERROR] Config файл \"$name_config\" не существует!"
+			exit 1
+		fi
+
 fi
 
 if ! [ -d "$PWD/$userName/$alias" ]
 then
 	mkdir -p $userName/$alias
-	if [ -d "$PWD/$userName/$alias" ];	
+	if [ -d "$PWD/$userName/$alias" ];
 	then
 		echo "[Ok] Директория под проект создана!"
 	else
@@ -144,4 +167,5 @@ do
 done
 
 pseudo_run_test
+merg_and_del
 echo -e "\n[Ok] Скрипт отработал!"
\ No newline at end of file