From: Jörg-Volker Peetz <jvpeetz@web.de>
Date: Sat, 5 Jan 2019 22:42:20 +0000 (+0000)
Subject: fix-zstdgrep-exit-code
X-Git-Tag: archive/raspbian/1.3.8+dfsg-3+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1cd753b9c023a57a64bc0e2f21849dc42eee8893;p=libzstd.git

fix-zstdgrep-exit-code


Gbp-Pq: Name 0016-fix-zstdgrep-exit-code.patch
---

diff --git a/programs/zstdgrep b/programs/zstdgrep
index a10e071..57a6abe 100755
--- a/programs/zstdgrep
+++ b/programs/zstdgrep
@@ -113,16 +113,11 @@ else
     if [ "${silent}" -lt 1 ] && [ "$#" -gt 1 ]; then
         grep_args="-H ${grep_args}"
     fi
-    CUR_EXIT_CODE=0
-    EXIT_CODE=1
     set -f
     while [ "$#" -gt 0 ]; do
         # shellcheck disable=SC2086
         "${zcat}" -fq -- "$1" | "${grep}" --label="${1}" ${grep_args} -- "${pattern}" -
-        CUR_EXIT_CODE=$?
-        if [ "${CUR_EXIT_CODE}" -eq 0 ] && [ "${EXIT_CODE}" -ne 1 ]; then
-            EXIT_CODE=0
-        fi
+        [ "$?" -ne 0 ] && EXIT_CODE=1
         shift
     done
     set +f