From: Mark Wielaard <mark@klomp.org>
To: bzip2-devel@sourceware.org
Cc: "Martin Pluskal" <mpluskal@suse.com>,
"Bjørn Lie" <bjorn.lie@gmail.com>,
"Kristýna Streitová" <kstreitova@suse.com>,
"Mark Wielaard" <mark@klomp.org>
Subject: [PATCH] Fix bzgrep so it doesn't always return a 0 exit code with multiple archives
Date: Tue, 01 Jan 2019 00:00:00 -0000 [thread overview]
Message-ID: <20190711233616.19470-1-mark@klomp.org> (raw)
bzip2 lost its domain and got a new home at https://sourceware.org/bzip2/
It also didn't see a release for a very long time. Causing various patches
used by distros to not have been integrated upstream. We are trying to
collect them all and do a new release.
The following patch comes from openSUSE.
Please let us know if we missed some others.
Thanks,
Mark
The bzgrep wrapper always returns 0 as exit code when working on
multiple archives, even when the pattern is not found.
Fix from openSUSE by Kristýna Streitová <kstreitova@suse.com>
https://bugzilla.suse.com/970260
---
bzgrep | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
mode change 100644 => 100755 bzgrep
diff --git a/bzgrep b/bzgrep
old mode 100644
new mode 100755
index 5080afd..0314ca6
--- a/bzgrep
+++ b/bzgrep
@@ -65,8 +65,20 @@ for i do
else
j=$(echo "$i" | sed 's/\\/&&/g;s/|/\\&/g;s/&/\\&/g')
j=`printf "%s" "$j" | tr '\n' ' '`
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
- r=$?
+ # A trick adapted from
+ # https://groups.google.com/forum/#!original/comp.unix.shell/x1345iu10eg/Nn1n-1r1uU0J
+ # that has the same effect as the following bash code:
+ # bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
+ # r=${PIPESTATUS[1]}
+ exec 3>&1
+ eval `
+ exec 4>&1 >&3 3>&-
+ {
+ bzip2 -cdfq "$i" 4>&-
+ } | {
+ $grep $opt "$pat" 4>&-; echo "r=$?;" >&4
+ } | sed "s|^|${j}:|"
+ `
fi
test "$r" -ne 0 && res="$r"
done
--
2.20.1
reply other threads:[~2019-07-11 23:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190711233616.19470-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=bjorn.lie@gmail.com \
--cc=bzip2-devel@sourceware.org \
--cc=kstreitova@suse.com \
--cc=mpluskal@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).