From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 6 Mar 2016 19:16:34 +0000 (-0800)
Subject: gzip: minor zgrep cleanup
X-Git-Tag: v1.7~14
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=2c5f8b3d1edfca163e4c4fbc2541bc53c1dca684;p=debian%2Fgzip

gzip: minor zgrep cleanup

* zgrep.in: Simplify previous change.
---

diff --git a/zgrep.in b/zgrep.in
index bbea331..c24be57 100644
--- a/zgrep.in
+++ b/zgrep.in
@@ -203,13 +203,12 @@ do
       sed_script="s|^|$i:|"
 
       # Fail if grep or sed fails.
-      if r=$(
-           exec 4>&1
-           (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
-         ) || { r=$?; test $r -lt 2 && r=2; :; }; then
-        test 256 -le $r && r=$(expr 128 + $r % 128)
-        exit $r
-      fi
+      r=$(
+        exec 4>&1
+        (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
+      ) || { r=$?; test $r -lt 2 && r=2; }
+      test 256 -le $r && r=$(expr 128 + $r % 128)
+      exit $r
     fi >&3 5>&-
   )
   r=$?