Skip to content

Commit

Permalink
Merge pull request #246 from mechanicalamit/egrep_to_grep_E
Browse files Browse the repository at this point in the history
Change occurrences of egrep to grep -E
  • Loading branch information
jserv authored Jan 3, 2024
2 parents 15f9a49 + e19b185 commit a3f5e3b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .ci/check-format.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

SOURCES=$(find $(git rev-parse --show-toplevel) | egrep "\.(cpp|cc|c|h)\$")
SOURCES=$(find $(git rev-parse --show-toplevel) | grep -E "\.(cpp|cc|c|h)\$")

CLANG_FORMAT=$(which clang-format-12)
if [ $? -ne 0 ]; then
Expand All @@ -18,4 +18,4 @@ do
$CLANG_FORMAT ${file} > expected-format
diff -u -p --label="${file}" --label="expected coding style" ${file} expected-format
done
exit $($CLANG_FORMAT --output-replacements-xml ${SOURCES} | egrep -c "</replacement>")
exit $($CLANG_FORMAT --output-replacements-xml ${SOURCES} | grep -E -c "</replacement>")
12 changes: 6 additions & 6 deletions .ci/static-analysis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

function do_cppcheck()
{
local SOURCES=$(find $(git rev-parse --show-toplevel) | egrep "\.(cpp|cc|c|h)\$")
local SOURCES=$(find $(git rev-parse --show-toplevel) | grep -E "\.(cpp|cc|c|h)\$")

local CPPCHECK=$(which cppcheck)
if [ $? -ne 0 ]; then
Expand All @@ -25,7 +25,7 @@ function do_cppcheck()
--std=c89 "

$CPPCHECK $OPTS --xml ${SOURCES} 2> cppcheck.xml
local ERROR_COUNT=$(cat cppcheck.xml | egrep -c "</error>" )
local ERROR_COUNT=$(cat cppcheck.xml | grep -E -c "</error>" )

if [ $ERROR_COUNT -gt 0 ]; then
echo "Cppcheck failed: $ERROR_COUNT error(s)"
Expand All @@ -49,8 +49,8 @@ function do_sparse()

make -C examples C=2 CHECK="$SPARSE" 2> sparse.log

local WARNING_COUNT=$(cat sparse.log | egrep -c " warning:" )
local ERROR_COUNT=$(cat sparse.log | egrep -c " error:" )
local WARNING_COUNT=$(cat sparse.log | grep -E -c " warning:" )
local ERROR_COUNT=$(cat sparse.log | grep -E -c " error:" )
local COUNT=`expr $WARNING_COUNT + $ERROR_COUNT`
if [ $COUNT -gt 0 ]; then
echo "Sparse failed: $WARNING_COUNT warning(s), $ERROR_COUNT error(s)"
Expand All @@ -70,8 +70,8 @@ function do_gcc()

make -C examples CONFIG_STATUS_CHECK_GCC=y STATUS_CHECK_GCC=$GCC 2> gcc.log

local WARNING_COUNT=$(cat gcc.log | egrep -c " warning:" )
local ERROR_COUNT=$(cat gcc.log | egrep -c " error:" )
local WARNING_COUNT=$(cat gcc.log | grep -E -c " warning:" )
local ERROR_COUNT=$(cat gcc.log | grep -E -c " error:" )
local COUNT=`expr $WARNING_COUNT + $ERROR_COUNT`
if [ $COUNT -gt 0 ]; then
echo "gcc failed: $WARNING_COUNT warning(s), $ERROR_COUNT error(s)"
Expand Down

0 comments on commit a3f5e3b

Please sign in to comment.