retrieve: use grep -E instead of mawk for regex source

tests: exit shellcheck if no scripts found
jarelllama · Feb 6, 2025 · e15f2bd · e15f2bd
1 parent 3b0fa62
commit e15f2bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/scripts/retrieve_domains.sh b/scripts/retrieve_domains.sh
@@ -574,7 +574,7 @@ search_google() {
         printf "%s\n" "$page_domains" >> "$source_results"
 
         # Stop search term if no more pages are required
-        (( $(wc -w <<< "$page_domains") < 10 )) && break
+        (( $(wc -l <<< "$page_domains") < 10 )) && break
     done
 
     process_source_results
@@ -691,7 +691,7 @@ source_dga_detector() {
 }
 
 source_regex() {
-    # Last checked: 21/01/25
+    # Last checked: 06/02/25
     source_name='Regex'
     exclude_from_light=true
 
@@ -715,7 +715,7 @@ source_regex() {
         local regex="${pattern//&/${escaped_domain}}"
 
         # Get matches in NRD feed
-        results="$(mawk "/${regex}/" nrd.tmp | sort -u)"
+        results="$(grep -E "$regex" nrd.tmp | sort -u)"
 
         # Collate results
         printf "%s\n" "$results" >> source_results.tmp

diff --git a/scripts/test_functions.sh b/scripts/test_functions.sh
@@ -75,6 +75,8 @@ SHELLCHECK() {
     # Find scripts
     scripts=$(find . -type f -name "*.sh")
 
+    [[ -z "$scripts" ]] && error 'No scripts found.'
+
     # Run ShellCheck for each script
     for script in $scripts; do
         shellcheck-stable/shellcheck "$script" || error=true