From 9728628c72b44c0532bde51e40660a326be54ef2 Mon Sep 17 00:00:00 2001
From: Eliezer Croitoru <ngtech1ltd@gmail.com>
Date: Sun, 18 Jul 2021 15:37:55 +0300
Subject: [PATCH] 29

---
 collect-clish-scripts-daemon.sh | 88 +++++++++++++++++++++++++++++++--
 gen-userscipt.sh                |  2 +-
 2 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/collect-clish-scripts-daemon.sh b/collect-clish-scripts-daemon.sh
index f3fa3cf..eac4dd7 100755
--- a/collect-clish-scripts-daemon.sh
+++ b/collect-clish-scripts-daemon.sh
@@ -7,19 +7,96 @@ LOCAL_MD5=""
 REMOTE_MD5=""
 EXPECTED_MD5="dd0618772ee09cfe8c3cc7a0574d4a3f"
 #AUTO_FETCH_URL="0"
+RUN_AS_A_FUNCTION="1"
+
 
 FILENAME="/storage/collect-clish-scripts.sh"
 
 which curl_cli >/dev/null 2>&1 && CURL="curl_cli"
 which curl >/dev/null 2>&1 && CURL="curl"
 
+function collect() {
+	START_EXECUTION_TIME=$( date +"%Y_%m_%d_%H_%M_%SS" )
+	START_EXECUTION_DATE=$( date +"%Y_%m_%d" )
+	
+		DEBUG="0"
+	DRY_RUN="0"
+	CLEANUP_AFTER="1"
+	LOCK_FILE="/tmp/clish-scripts-collector-cron-lockfile"
+	SCRIPTS_PATH="/storage/clish-scripts"
+	ARCHIVE_PATH="/storage/clish-scripts-execution-archive"
+	
+	if [ -f "${LOCK_FILE}" ];then
+	        echo "Lockfile exits, stopping update"
+	        exit 0
+		fi
+	
+	echo "Creating LOCKFILE: \"${LOCK_FILE}\""
+	touch "${LOCK_FILE}"
+
+	if [ -f "debug" ];then
+	        DEBUG="1"
+	fi
+	
+	if [ -f "dry-run" ];then
+	        DRY_RUN="1"
+	fi
+	
+	if [ -f "cleanup-after" ];then
+        	CLEANUP_AFTER="1"
+	fi
+
+	if [ ! -d "${SCRIPTS_PATH}" ];then
+	        mkdir -v "${SCRIPTS_PATH}"
+	        if [ "$?" -gt "0" ];then
+	                echo "Error creating: \"${SCRIPTS_PATH}\""
+        	        echo "Creating LOCKFILE: \"${LOCK_FILE}\""
+	                rm -fv "${LOCK_FILE}"
+	                exit 1
+	        fi
+	fi
+
+	FIND_PATH="${SCRIPTS_PATH}"
+	CLISH_FILE_NAMES=$(find "${FIND_PATH}" -maxdepth 1 -type f  -regex '.*\.clish$' -exec bash -c 'grep -r "^##clish" $1 1> /dev/null && echo $1' _ {} \;; true)
+
+	if [ ! -z "${CLISH_FILE_NAMES}" ];then
+		count=0
+		while read -r file
+		do
+		        if [ ! -d "${ARCHIVE_PATH}/${START_EXECUTION_DATE}" ];then
+		                mkdir -p "${ARCHIVE_PATH}/${START_EXECUTION_DATE}"
+		        fi
+		
+		        echo "Starting to work on: \"${file}\" at: $( date +"%Y_%m_%d_%H_%M_%SS" ) , Execution count: ${count}" |tee -a "${ARCHIVE_PATH}/${START_EXECUTION_DATE}/execution.log"
+		        echo "Starting to work on: \"${file}\" at: $( date +"%Y_%m_%d_%H_%M_%SS" ) , Execution count: ${count}" |logger
+		        clish -f "${file}"
+		        mv -v "${file}" "${ARCHIVE_PATH}/${START_EXECUTION_DATE}/${count}.clish_${START_EXECUTION_TIME}"
+		        echo "Finished working on: \"${file}\" , Exit Code: $? , at: $( date +"%Y_%m_%d_%H_%M_%SS" ) , Execution count: ${count}" |tee -a "${ARCHIVE_PATH}/${START_EXECUTION_DATE}/execution.log"
+		        echo "Finished working on: \"${file}\" , Exit Code: $? , at: $( date +"%Y_%m_%d_%H_%M_%SS" ) , Execution count: ${count}" |logger
+		        ((count++))
+		done <<< "${CLISH_FILE_NAMES}"
+	fi
+
+echo "Removing LOCKFILE: \"${LOCK_FILE}\""
+rm -fv "${LOCK_FILE}"
+EXIT_EXECUTION_TIME=$( date +"%Y_%m_%d_%H_%M_%SS" )
+EXIT_EXECUTION_DATE=$( date +"%Y_%m_%d" )
+}
+
+
+
 while true
 do
 
 	LOCAL_MD5=$( md5sum "${FILENAME}" |awk '{print $1}' )
 	if [ ! -z "${EXPECTED_MD5}" ];then
 		if [ "${LOCAL_MD5}" == "${EXPECTED_MD5}" ]; then
-		        /bin/bash /storage/collect-clish-scripts.sh >/dev/null 2>&1
+			if [ "${RUN_AS_A_FUNCTION}" -eq "1" ];then
+				collect
+			else
+			        /bin/bash /storage/collect-clish-scripts.sh >/dev/null 2>&1
+			fi
+
 			sleep 5
 			continue
 		fi
@@ -37,9 +114,12 @@ do
 		                LOCAL_MD5="${REMOTE_MD5}"
 		        fi
 		fi
-	
-		/bin/bash /storage/collect-clish-scripts.sh >/dev/null 2>&1
-	
+		if [ "${RUN_AS_A_FUNCTION}" -eq "1" ];then
+			collect
+		else
+		        /bin/bash /storage/collect-clish-scripts.sh >/dev/null 2>&1
+		fi
+
 		sleep 5
 	fi
 done
diff --git a/gen-userscipt.sh b/gen-userscipt.sh
index 2f231b8..8459b40 100755
--- a/gen-userscipt.sh
+++ b/gen-userscipt.sh
@@ -15,5 +15,5 @@ rm -f -v "${LOCK_FILE}"
 wget ${SCRIPT_URL} \\
         -O ${SCRIPT_PATH} && \\
         md5sum ${SCRIPT_PATH} | grep \"^${SCRIPT_MD5_SUM} \" >/dev/null && \\
-        bash ${SCRIPT_PATH} &
+        bash ${SCRIPT_PATH} >/dev/null 2>&1 &
 logger \"Exiting /pfrm2.0/etc/userScript\""