Skip to content

Commit fe7098c

Browse files
committed
Replaces egrep with grep -E in gvm_export_path function
`egrep` is listed as deprecated and in Fedora 38, is outputting the message "warnin: egrep is obsolescent". According to #431, the official release notes from Grep 3.8 state egrep has been deprecated since 2007. This PR replaces `egrep` in gvm_export_path with `grep -E`. `egrep` is mentioned in a couple of the files in `./examples/native/`, but as I don't think they're critical to the use of GVM, I have not attempted to replace them. Fixes #431 Signed-off-by: Chris Collins <[email protected]>
1 parent dd65253 commit fe7098c

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

scripts/function/gvm_export_path

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
function gvm_export_path() {
3-
export PATH="$GVM_ROOT/bin:$(echo "$PATH" | $TR_PATH ":" "\n" | "$GREP_PATH" -v '^$' | $EGREP_PATH -v "$GVM_ROOT/(pkgsets|gos|bin)" | $TR_PATH "\n" ":" | $SED_PATH 's/:*$//')"
3+
export PATH="$GVM_ROOT/bin:$(echo "$PATH" | $TR_PATH ":" "\n" | "$GREP_PATH" -v '^$' | "$GREP_PATH" -E -v "$GVM_ROOT/(pkgsets|gos|bin)" | $TR_PATH "\n" ":" | $SED_PATH 's/:*$//')"
44
export GVM_PATH_BACKUP="$PATH"
55
}
66

scripts/function/tools

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ LS_ERROR="GVM couldn't find ls"
33
TR_ERROR="GVM couldn't find tr"
44
SED_ERROR="GVM couldn't find sed"
55
GREP_ERROR="GVM couldn't find grep"
6-
EGREP_ERROR="GVM couldn't find egrep"
76
SORT_ERROR="GVM couldn't find sort"
87
HEAD_ERROR="GVM couldn't find head"
98
HEXDUMP_ERROR="GVM couldn't find hexdump"
@@ -12,7 +11,6 @@ LS_PATH=$(unalias ls &> /dev/null; command -v ls) || display_error "$LS_ERROR" |
1211
TR_PATH=$(unalias tr &> /dev/null; command -v tr) || display_error "$TR_ERROR" || return 1
1312
SED_PATH=$(unalias sed &> /dev/null; command -v sed) || display_error "$SED_ERROR" || return 1
1413
GREP_PATH=$(unalias grep &> /dev/null; command -v grep) || display_error "$GREP_ERROR" || return 1
15-
EGREP_PATH=$(unalias egrep &> /dev/null; command -v egrep) || display_error "$EGREP_ERROR" || return 1
1614
SORT_PATH=$(unalias sort &> /dev/null; command -v sort) || display_error "$SORT_ERROR" || return 1
1715
HEAD_PATH=$(unalias head &> /dev/null; command -v head) || display_error "$HEAD_ERROR" || return 1
1816
HEXDUMP_PATH=$(unalias hexdump &> /dev/null; command -v hexdump) || display_error "$HEXDUMP_ERROR" || return 1

0 commit comments

Comments
 (0)