From 5fc6a2cc3b60cd7379dd58d396944484f63a0f06 Mon Sep 17 00:00:00 2001
From: Guillaume Astier Ruiz <guillaume@tuxme.net>
Date: Tue, 4 Feb 2025 13:23:25 +0100
Subject: [PATCH] [UPDATE] - script & log

---
 pem-cyber-linux.d/config   | 5 +++--
 pem-cyber-linux.d/function | 2 +-
 pem-cyber-linux.sh         | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pem-cyber-linux.d/config b/pem-cyber-linux.d/config
index 254a0c7..36b997e 100644
--- a/pem-cyber-linux.d/config
+++ b/pem-cyber-linux.d/config
@@ -2,5 +2,6 @@
 DirFct=$(realpath $(dirname $0))/$(echo $(basename $0)| sed 's/.sh/.d/g')/
 DirCheck=$(realpath $(dirname $0))/Check
 DirApply=$(realpath $(dirname $0))/Apply
-Debug='-x'
-LogDir=/var/log/$(echo $(basename $0) |sed 's/.sh//g')/$(date +%H%m%d%H%M%S)/
+#Debug='-x'
+Debug=""
+LogDir=/var/log/$(echo $(basename $0) |sed 's/.sh//g')/$(date +%H%m%d%H%M%S)
diff --git a/pem-cyber-linux.d/function b/pem-cyber-linux.d/function
index d9f071d..76fed34 100644
--- a/pem-cyber-linux.d/function
+++ b/pem-cyber-linux.d/function
@@ -19,7 +19,7 @@ function LogTest() {
             echo -e "\n### ${2} - [RESULT] - ${3} : FAILED"
         else
             echo -e "\n### ${2} - [RESULT] - ${3} : SUCESS"
-    fi | tee -a ${LogDir}/${3}.log
+    fi | tee -a ${RealLogDir}/${3}.log
 }
 
 function GetArg(){
diff --git a/pem-cyber-linux.sh b/pem-cyber-linux.sh
index 119a49a..2769dc8 100755
--- a/pem-cyber-linux.sh
+++ b/pem-cyber-linux.sh
@@ -30,14 +30,15 @@ source ${DirFct}/function_${Action}
 
 [[ $Level -eq 2 ]] && RealLevel=\* || RealLevel=1
 DirAction=$(realpath $(dirname $0))/${Action}/${Type}/${RealLevel}
+RealLogDir=$(dirname ${LogDir})/${Action}_$(basename ${LogDir})
 
-[[ ! -d ${LogDir} ]] && mkdir -p ${LogDir} || true
+[[ ! -d ${RealLogDir} ]] && mkdir -p ${RealLogDir} || true
 
 for File in $(find ${DirAction} -type f -name run.sh| sort -n)
 	do
 		cd $(dirname ${File})
 		Test=$(basename $(dirname ${File}))
 		export CptErr=0
-		bash ${Debug} ./run.sh &> ${LogDir}/${Test}.log
+		bash ${Debug} ./run.sh &> ${RealLogDir}/${Test}.log
         	LogTest ${?} ${Action} ${Test}
 	done