build: Remove usage of obsolescent egrep

* "egrep: warning: egrep is obsolescent; using grep -E"
* egrep on haiku is a shell script calling grep -E
* given the warnings in the latest egrep, lets get
  ahead of the curve and migrate to grep -E

Change-Id: I0fc2b936c7a9c52f87caf97d8e9ac42516fee014
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5718
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2022-10-06 16:28:01 +00:00
committed by waddlesplash
parent ffc2227f28
commit 46cbd8ea98
5 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -266,7 +266,7 @@ actions ResComp1
{ {
export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
cat "$(2[2-])" | $(CC) $(CCFLAGS) -E $(CCDEFS) $(HDRS) - \ cat "$(2[2-])" | $(CC) $(CCFLAGS) -E $(CCDEFS) $(HDRS) - \
| egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" - | grep -E -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o "$(1)" -
} }
rule ResAttr attributeFile : _resourceFiles : deleteAttributeFile rule ResAttr attributeFile : _resourceFiles : deleteAttributeFile
+1 -1
View File
@@ -374,7 +374,7 @@ fi
# install default settings for packages # install default settings for packages
for packageFile in $systemPackages; do for packageFile in $systemPackages; do
if $package list -p $packageFile | egrep '^settings/' > /dev/null; then if $package list -p $packageFile | grep -E '^settings/' > /dev/null; then
extractFile $packageFile system/settings settings extractFile $packageFile system/settings settings
fi fi
done done
+1 -1
View File
@@ -132,7 +132,7 @@ do
done done
ALLOCATIONS=$(cat "$FILENAME" | egrep "^allocation: |^ " | tr '\n' '^' \ ALLOCATIONS=$(cat "$FILENAME" | grep -E "^allocation: |^ " | tr '\n' '^' \
| sed 's/\^a/~a/g' | tr '~' '\n' | sed 's/$/^/' | c++filt) | sed 's/\^a/~a/g' | tr '~' '\n' | sed 's/$/^/' | c++filt)
if [ ! -z "$EXCLUDE_PATTERN" ] if [ ! -z "$EXCLUDE_PATTERN" ]
+3 -3
View File
@@ -41,14 +41,14 @@ res=0
for i in `unzip -Z1 "$zipfile" ${1+"$@"}`; do for i in `unzip -Z1 "$zipfile" ${1+"$@"}`; do
if test $list -eq 1; then if test $list -eq 1; then
unzip -p-L "$zipfile" "$i" | egrep $opt "$pat" > /dev/null && echo $i unzip -p-L "$zipfile" "$i" | grep -E $opt "$pat" > /dev/null && echo $i
r=$? r=$?
elif test $silent -eq 1; then elif test $silent -eq 1; then
unzip -p-L "$zipfile" "$i" | egrep $opt "$pat" unzip -p-L "$zipfile" "$i" | grep -E $opt "$pat"
r=$? r=$?
else else
unzip -p-L "$zipfile" "$i" | egrep $opt "$pat" | sed "s|^|${i}:|" unzip -p-L "$zipfile" "$i" | grep -E $opt "$pat" | sed "s|^|${i}:|"
r=$? r=$?
fi fi
test "$r" -ne 0 && res="$r" test "$r" -ne 0 && res="$r"
+1 -1
View File
@@ -38,7 +38,7 @@ function check_logs {
echo "NO" echo "NO"
fi fi
echo " Potential issues in logs:" echo " Potential issues in logs:"
egrep -i "FATAL|ERROR|FAIL|GDB" $FILE | grep -vi " No error" grep -E -i "FATAL|ERROR|FAIL|GDB" $FILE | grep -vi " No error"
} }
case "$PLATFORM" in case "$PLATFORM" in