Skip to content

Commit de5ee18

Browse files
hebastobluca
authored andcommitted
Replace egrep with grep -E
For the GNU Grep package version >= 3.8, the `egrep` command emits: ``` egrep: warning: egrep is obsolescent; using grep -E ``` which makes the `./autogen.sh` script very noisy.
1 parent ec013f3 commit de5ee18

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ pipeline {
443443
echo "Used: myDEPLOY_JOB_NAME:${myDEPLOY_JOB_NAME} myDEPLOY_BRANCH_PATTERN:${myDEPLOY_BRANCH_PATTERN} myDEPLOY_REPORT_RESULT:${myDEPLOY_REPORT_RESULT}"
444444
if ( (myDEPLOY_JOB_NAME != "") && (myDEPLOY_BRANCH_PATTERN != "") ) {
445445
if ( env.BRANCH_NAME =~ myDEPLOY_BRANCH_PATTERN ) {
446-
def GIT_URL = sh(returnStdout: true, script: """git remote -v | egrep '^origin' | awk '{print \$2}' | head -1""").trim()
446+
def GIT_URL = sh(returnStdout: true, script: """git remote -v | grep -E '^origin' | awk '{print \$2}' | head -1""").trim()
447447
def GIT_COMMIT = sh(returnStdout: true, script: 'git rev-parse --verify HEAD').trim()
448448
def DIST_ARCHIVE = ""
449449
if ( params.DO_DIST_DOCS ) { DIST_ARCHIVE = env.BUILD_URL + "artifact/__dist.tar.gz" }

builds/zos/runtests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ SKIP_TESTS="test_.*_tipc"
6363
#
6464
# Excluding tests we know will fail because of missing functionality
6565
#
66-
noinst_PROGRAMS=$(grep "test_" Makefile.am | egrep -v "_SOURCES|XFAIL" |
66+
noinst_PROGRAMS=$(grep "test_" Makefile.am | grep -E -v "_SOURCES|XFAIL" |
6767
sed 's/noinst_PROGRAMS.* test/test/; s/^ *//; s/ *\\ *$//;' |
68-
grep -v "${SKIP_TESTS}" | egrep -v "${XFAIL_TESTS}")
68+
grep -v "${SKIP_TESTS}" | grep -E -v "${XFAIL_TESTS}")
6969
#echo "Found tetsts: ${noinst_PROGRAMS}"
7070

7171
# Run tests on command line, or all tests we found

version.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ if [ ! -f include/zmq.h ]; then
77
echo "version.sh: error: include/zmq.h does not exist" 1>&2
88
exit 1
99
fi
10-
MAJOR=`egrep '^#define +ZMQ_VERSION_MAJOR +[0-9]+$' include/zmq.h`
11-
MINOR=`egrep '^#define +ZMQ_VERSION_MINOR +[0-9]+$' include/zmq.h`
12-
PATCH=`egrep '^#define +ZMQ_VERSION_PATCH +[0-9]+$' include/zmq.h`
10+
MAJOR=`grep -E '^#define +ZMQ_VERSION_MAJOR +[0-9]+$' include/zmq.h`
11+
MINOR=`grep -E '^#define +ZMQ_VERSION_MINOR +[0-9]+$' include/zmq.h`
12+
PATCH=`grep -E '^#define +ZMQ_VERSION_PATCH +[0-9]+$' include/zmq.h`
1313
if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
1414
echo "version.sh: error: could not extract version from include/zmq.h" 1>&2
1515
exit 1

0 commit comments

Comments
 (0)