fgrep has been obsoleted
This commit is contained in:
parent
d509ec2bc4
commit
680c2cac32
2 changed files with 3 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue