Improve scripts for checking dead domains - part 4

FiltersHeroes · Sep 4, 2023 · 08b3778 · 08b3778
1 parent 176b508
commit 08b3778
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/expiredDomains.yml b/.github/workflows/expiredDomains.yml
@@ -177,7 +177,6 @@ jobs:
           name: E_KAD_
           path: expired-domains
           name_is_regexp: true
-          run_id: ${{ github.event.workflow_run.id }}
       - run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           ./scripts/CI/CI_LETS_DO_THIS_KAD_limit.sh

diff --git a/scripts/CI/CI_LETS_DO_THIS.sh b/scripts/CI/CI_LETS_DO_THIS.sh
@@ -7,6 +7,10 @@ MAIN_PATH=$(git -C "$SCRIPT_PATH" rev-parse --show-toplevel)
 
 cd "$MAIN_PATH" || exit
 
+# Limit czasu uruchamiania
+CI_TIME_LIMIT="15 minutes"
+export CI_TIME_LIMIT
+
 function letsGo() {
     for i in "$@"; do
         F_NAME=$(basename "$i")

diff --git a/scripts/ECODFF.sh b/scripts/ECODFF.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ECODFF - Expiration Check Of Domains From Filterlists
-# v1.19.5
+# v1.19.6
 
 # MIT License
 
@@ -38,6 +38,12 @@ fi
 
 cd "$MAIN_PATH" || exit
 
+
+DSC=$("$SCRIPT_PATH"/DSC.sh)
+if [ -n "${CI_TIME_LIMIT}" ]; then
+    DSC=$("$SCRIPT_PATH"/DSC.sh -t "$CI_TIME_LIMIT")
+fi
+
 for i in "$@"; do
 
     pageComma=$(pcregrep -o1 '^([a-z0-9-~][^\/\*\|\@\"\!]*?)(#|\$\$)' "$i")
@@ -122,7 +128,7 @@ EOF
     fi
 
     if [ -f "$TEMPORARY.3" ]; then
-        "$SCRIPT_PATH"/DSC.sh -t "2 hours 30 minutes" -f "$TEMPORARY".3 | tee "$TEMPORARY".4
+        "$DSC" -f "$TEMPORARY".3 | tee "$TEMPORARY".4
 
         touch "$MAIN_PATH"/expired-domains/"$FILTERLIST"-unknown.txt
 
@@ -157,7 +163,7 @@ EOF
     fi
 
     if [ -f "$TEMPORARY.6" ]; then
-        "$SCRIPT_PATH"/DSC.sh -t "2 hours 30 minutes" -f "$TEMPORARY".6 | tee "$TEMPORARY".7
+        "$DSC" -f "$TEMPORARY".6 | tee "$TEMPORARY".7
 
         {
             sed '/Expired/!d' "$TEMPORARY".7 | cut -d' ' -f1