Skip to content

Commit 72d8594

Browse files
committedOct 8, 2022
lunar plugins: Replace fgrep and egrep with grep -F and grep -E
1 parent bd5c752 commit 72d8594

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed
 

‎plugins/check-find.plugin

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ plugin_module_check_find() {
2626
IFS_OLD="$IFS"
2727
export IFS=$'\n'
2828

29-
LOG=$(egrep "/(bin|games|include|lib(32|64)?|sbin)/" $I_LOG | egrep -v "/(doc|etc|fonts|man|var)/")
29+
LOG=$(grep -E "/(bin|games|include|lib(32|64)?|sbin)/" $I_LOG | grep -E -v "/(doc|etc|fonts|man|var)/")
3030

3131
for ITEM in $LOG; do
3232
if [ ! -e "$ITEM" ]; then

‎plugins/check-ldd.plugin

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ plugin_module_check_ldd() {
2828
export IFS=$'\n'
2929

3030
# fast-construct per-module LD path including all /lib/ like directories
31-
NEW_LD=$(egrep "/lib(32|64)?/" $I_LOG | files | sed 's/\(.*\)\/\([^\/]*\)$/\1/g' | sort -u | tr '\n' ':')
32-
LOG=$(egrep "/(bin|games|lib(32|64)?|sbin|libexec)/" $I_LOG | egrep -v "/(doc|fonts|include|locale|man|modules|var|share|pkgconfig)/")
31+
NEW_LD=$(grep -E "/lib(32|64)?/" $I_LOG | files | sed 's/\(.*\)\/\([^\/]*\)$/\1/g' | sort -u | tr '\n' ':')
32+
LOG=$(grep -E "/(bin|games|lib(32|64)?|sbin|libexec)/" $I_LOG | grep -E -v "/(doc|fonts|include|locale|man|modules|var|share|pkgconfig)/")
3333

3434
for FILE in $LOG; do
35-
if [ -f "$FILE" ] && [ ! -h "$FILE" ] && file -b "$FILE" | grep -q "ELF" && LD_LIBRARY_PATH=$NEW_LD ldd "$FILE" 2>&1 | egrep -q "(not found|lunar/OBSOLETE/)"; then
35+
if [ -f "$FILE" ] && [ ! -h "$FILE" ] && file -b "$FILE" | grep -q "ELF" && LD_LIBRARY_PATH=$NEW_LD ldd "$FILE" 2>&1 | grep -E -q "(not found|lunar/OBSOLETE/)"; then
3636
(
3737
export IFS="$IFS_OLD"
3838
message "${FILE_COLOR}${FILE}${DEFAULT_COLOR} of ${MODULE_COLOR}${MODULE} ${PROBLEM_COLOR}is broken. ${DEFAULT_COLOR}"
39-
LD_LIBRARY_PATH=$NEW_LD ldd "$FILE" 2>&1 | egrep "(not found|lunar/OBSOLETE/)"
39+
LD_LIBRARY_PATH=$NEW_LD ldd "$FILE" 2>&1 | grep -E "(not found|lunar/OBSOLETE/)"
4040
)
4141
LDD_STATUS=1
4242
fi

‎plugins/check-md5sum.plugin

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ plugin_module_check_md5sum() {
2727
if [ -e "$MD5_LOG" ]; then
2828
export IFS=$'\t\n'
2929

30-
egrep "/(bin|games|include|lib(32|64)?|sbin)/" $MD5_LOG |
31-
egrep -v "/(doc|etc|fonts|man|var)/" |
30+
grep -E "/(bin|games|include|lib(32|64)?|sbin)/" $MD5_LOG |
31+
grep -E -v "/(doc|etc|fonts|man|var)/" |
3232
while read LINE; do
3333
if ! echo $LINE | md5sum --check --status; then
3434
FILE=$(echo $LINE | awk '{ print $2 }')
3535
if [ -f "$FILE" ] && [ ! -h "$FILE" ] && file -b "$FILE" |
36-
egrep -q "executable|shared object|current ar archive|C?? source, ASCII text"; then
36+
grep -E -q "executable|shared object|current ar archive|C?? source, ASCII text"; then
3737
message "${FILE_COLOR}$FILE${DEFAULT_COLOR} of ${MODULE_COLOR}$MODULE${PROBLEM_COLOR} has wrong md5sum.${DEFAULT_COLOR}"
3838
MD5SUM_STATUS=1
3939
fi

0 commit comments

Comments
 (0)
Please sign in to comment.