Fix detection of lib, lib32 and lib64 in check plugins

lunar-linux · Feb 8, 2020 · b51e310 · b51e310
1 parent 3dae3db
commit b51e310
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/plugins/check-find.plugin b/plugins/check-find.plugin
@@ -27,7 +27,7 @@ plugin_module_check_find() {
     IFS_OLD="$IFS"
     export IFS=$'\n'
 
-    LOG=$(cat "$I_LOG" | grep "/bin/\|/games/\|/include/\|/lib/\|/sbin/" | grep -v  "/doc/\|/etc/\|/fonts/\|/man/\|/var/")
+    LOG=$(egrep "/(bin|games|include|lib(32|64)?|sbin)/" $I_LOG | egrep -v  "/(doc|etc|fonts|man|var)/")
 
     for ITEM in $LOG ; do
       if [ ! -e "$ITEM" ]; then

diff --git a/plugins/check-ldd.plugin b/plugins/check-ldd.plugin
@@ -27,8 +27,8 @@ plugin_module_check_ldd() {
     export IFS=$'\n'
 
     # fast-construct per-module LD path including all /lib/ like directories
-    NEW_LD=$(cat "$I_LOG" | grep "/lib/" | files | sed 's/\(.*\)\/\([^\/]*\)$/\1/g' | uniq | tr '\n' ':')
-    LOG=$(cat "$I_LOG" | grep "/bin/\|/games/\|/lib/\|/sbin/\|/libexec/" | grep -v "/doc/\|/fonts/\|/include/\|/locale/\|/man/\|/modules/\|/var/\|/share/")
+    NEW_LD=$(egrep "/lib(32|64)?/" $I_LOG | files | sed 's/\(.*\)\/\([^\/]*\)$/\1/g' | sort -u | tr '\n' ':')
+    LOG=$(egrep "/(bin|games|lib(32|64)?|sbin|libexec)/" $I_LOG | egrep -v "/(doc|fonts|include|locale|man|modules|var|share|pkgconfig)/")
 
     for FILE in $LOG; do
       if [ -f "$FILE" ] && [ ! -h "$FILE" ] && file -b "$FILE" | grep -q "ELF" && LD_LIBRARY_PATH=$NEW_LD ldd "$FILE" 2>&1 | grep -q "not found" ; then

diff --git a/plugins/check-md5sum.plugin b/plugins/check-md5sum.plugin
@@ -28,9 +28,9 @@ plugin_module_check_md5sum()  {
   if [ -e "$MD5_LOG" ]; then
     export IFS=$'\t\n'
 
-    cat "$MD5_LOG" | grep "/bin/\|/games/\|/include/\|/lib/\|/sbin/" |
-            grep -v "/doc/\|/etc/\|/fonts/\|/man/\|/var/" |
-            while read LINE ; do
+      egrep "/(bin|games|include|lib(32|64)?|sbin)/" $MD5_LOG |
+      egrep -v "/(doc|etc|fonts|man|var)/" |
+      while read LINE ; do
       if ! echo $LINE | md5sum --check --status ; then
         FILE=$(echo $LINE | awk '{ print $2 }')
         if [ -f "$FILE" ] && [ ! -h "$FILE" ] && file -b "$FILE" |