From 680c2cac32225d64cf04d408672b80ab96a0c580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Wed, 29 Mar 2023 13:04:38 +0200 Subject: [PATCH] fgrep has been obsoleted --- Regression/processing-params-in-reverse-order/runtest.sh | 4 ++-- Regression/testsuite/runtest.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Regression/processing-params-in-reverse-order/runtest.sh b/Regression/processing-params-in-reverse-order/runtest.sh index f96ee7a..a985759 100755 --- a/Regression/processing-params-in-reverse-order/runtest.sh +++ b/Regression/processing-params-in-reverse-order/runtest.sh @@ -32,8 +32,8 @@ rlJournalStart rlPhaseStartTest rlRun "TMP=$(mktemp)" rlRun "annocheck --verbose --skip-all --test-stack-prot /bin/bash /bin/cat |& tee $TMP" - rlRun "fgrep -i /bin/ $TMP | head -1 | fgrep /bash" - rlRun "fgrep -i /bin/ $TMP | tail -1 | fgrep /cat" + rlRun "grep -F -i /bin/ $TMP | head -1 | grep -F /bash" + rlRun "grep -F -i /bin/ $TMP | tail -1 | grep -F /cat" rlRun "rm -f $TMP" rlPhaseEnd rlJournalPrintText diff --git a/Regression/testsuite/runtest.sh b/Regression/testsuite/runtest.sh index 3162c2a..5406771 100755 --- a/Regression/testsuite/runtest.sh +++ b/Regression/testsuite/runtest.sh @@ -52,7 +52,7 @@ rlJournalStart # uninstalling unneeded RPMs, we'll need an override mechanism. The # following assumes just one SCL *enabled* (more than one installed), # and doesn't care of a (useless) revert: - echo ${X_SCLS} | fgrep toolset && \ + echo ${X_SCLS} | grep -F toolset && \ rlRun "cat /etc/rpm/*${X_SCLS%\ }* > ~/.rpmmacros" rlAssertRpm $PACKAGE