Merge pull request #420 from m-1-k-3/s115_chroot

Exit on sasquatch dependency error
e-m-b-a · Dec 5, 2022 · b08099b · b08099b
2 parents 7c3c2e0 + 2534dbd
commit b08099b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/config/bin_version_strings.cfg b/config/bin_version_strings.cfg
@@ -651,8 +651,8 @@ transmissionbt;;mit,gpl;"^transmission-cli\ [0-9]\.[0-9]+\ \([0-9]+\)$";"sed -r
 trigger;;unknown;"trigger\ version\ [0-9]+$";"sed -r 's/trigger\ version\ ([0-9]+)$/trigger:\1/'";
 tune2fs;;unknown;"tune2fs\ [0-9](\.[0-9]+)+?\ ";"sed -r 's/tune2fs\ ([0-9](\.[0-9]+)+?).*/e2fsprogs:\1/'";
 twonky;;unknown;"Twonky\ Version\ [0-9](\.[0-9]+)+?";"sed -r 's/Twonky\ Version\ ([0-9](\.[0-9]+)+?).*/twonky:\1/'";
-tzcode;;unknown;"\(tzcode\)\ 20[0-9][0-9][a-z]$";"sed -r 's/(tzcode\)\ ([0-9]+[a-z]+?)$/tzcode:\1/'";
-tzdata;;unknown;"\(tzdata\)\ 20[0-9][0-9][a-z]$";"sed -r 's/(tzdata\)\ ([0-9]+[a-z]+?)$/tzdata:\1/'";
+tzcode;;unknown;"\(tzcode\)\ 20[0-9][0-9][a-z]$";"sed -r 's/.*\(tzcode\)\ ([0-9]+[a-z]+?)$/tzcode:\1/'";
+tzdata;;unknown;"\(tzdata\)\ 20[0-9][0-9][a-z]$";"sed -r 's/.*\(tzdata\)\ ([0-9]+[a-z]+?)$/tzdata:\1/'";
 #tzo;;unknown;"^Tzo Version : [0-9](\.[0-9]+)+?";"NA";
 ubiquiti_speedtest;;unknown;"^Network\ Speed\ Tester\ client\ v[0-9](\.[0-9]+)+?\ \(c\)\ Ubiquiti\ Networks$";"sed -r 's/Network\ Speed\ Tester\ client\ v([0-9](\.[0-9]+)+?).*/ubiquiti:network_speed_tester:\1/'";
 ubnt-infctld;;unknown;"Multipurpose\(mtik,\ mcast\)\ control\ daemon\ v[0-9](\.[0-9]+)+?\ \(c\)\ Ubiquiti$";"sed -r 's/Multipurpose\(mtik,\ mcast\)\ control\ daemon\ v([0-9](\.[0-9]+)+?).*/ubiquiti:control_daemon:\1/'";

diff --git a/helpers/helpers_emba_dependency_check.sh b/helpers/helpers_emba_dependency_check.sh
@@ -207,9 +207,11 @@ setup_unblob() {
       echo -e "$GREEN""ok""$NC"
     else
       echo -e "$RED""not ok""$NC"
+      DEP_EXIT=1
     fi
   else
     echo -e "$RED""not ok""$NC"
+    DEP_EXIT=1
   fi
   print_output "    ""sasquatch"" - \\c" "no_log"
   if [[ -f /usr/local/bin/sasquatch_binwalk ]]; then
@@ -218,8 +220,10 @@ setup_unblob() {
   elif [[ -f /usr/local/bin/sasquatch_unblob ]]; then
     ln -s /usr/local/bin/sasquatch_unblob "$UNBLOB_PATH"/sasquatch
     echo -e "$ORANGE""warning""$NC"
+    DEP_EXIT=1
   else
     echo -e "$RED""not ok""$NC"
+    DEP_EXIT=1
   fi
 
 }

diff --git a/helpers/helpers_emba_prepare.sh b/helpers/helpers_emba_prepare.sh
@@ -627,7 +627,7 @@ generate_trickest_db() {
     git pull || true
     cd ../.. || true
 
-    find "$EXT_DIR"/trickest-cve -type f -iname "*.md" -exec grep -o -H "\-\ https://github.com/.*" {} \; | sed 's/:-\ /:/g' | sort > "$TRICKEST_DB_PATH" || true
+    find "$EXT_DIR"/trickest-cve -type f -iname "*.md" -exec grep -o -H "^\-\ https://github.com.*" {} \; | sed 's/:-\ /:/g' | sort > "$TRICKEST_DB_PATH" || true
 
     # if we have a blacklist file we are going to apply it to the generated trickest database
     if [[ -f "$CONFIG_DIR"/trickest_blacklist.txt ]] && [[ -f "$TRICKEST_DB_PATH" ]]; then