Fix zstdgrep exit code when operating on files
authorJörg-Volker Peetz <jvpeetz@web.de>
Thu, 18 Feb 2021 11:59:48 +0000 (11:59 +0000)
committerÉtienne Mollier <etienne.mollier@mailoo.org>
Thu, 18 Feb 2021 11:59:48 +0000 (11:59 +0000)
Forwarded: https://github.com/facebook/zstd/issues/1428

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

programs/zstdgrep

index a10e0710a29674cfe5416aed4745c51d3c1f7d91..57a6abe89b2da2bfe828011c28868990bf7ea2b2 100755 (executable)
@@ -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