summaryrefslogtreecommitdiff
path: root/zfgrep.in
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-04-10 15:26:47 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-04-10 15:27:16 -0700
commit7a061649358367ddd62dce4c31029532ed733447 (patch)
treee98d079a53a2d16e1ac31c5db378634db99cbe94 /zfgrep.in
parent015db6cd6bd628962d89956910ed8c58956a351a (diff)
downloadgzip-7a061649358367ddd62dce4c31029532ed733447.tar.gz
tests: work even if non-GNU gzip is installed in /usr/local/bin
Problem reported by Antonio Diaz Diaz in <http://lists.gnu.org/archive/html/bug-gzip/2013-04/msg00004.html>. * tests/help-version (zdiff_setup, zcat_setup, znew_setup, zgrep_setup) (gzexe_setup): Pass --__bindir so that subsidiary programs are our own's, not /usr/local/bin's. This requires using 'eval' on the result. (zcmp_setup, gunzip_setup, zmore_setup, zless_setup, zforce_setup) (zegrep_setup, zfgrep_setup): Invoke one of the other setup functions, to make the patterns more obvious and simplify future maintenance. * zcmp.in, zegrep.in, zfgrep.in: Pass __bindir to subsidiary program.
Diffstat (limited to 'zfgrep.in')
-rw-r--r--zfgrep.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/zfgrep.in b/zfgrep.in
index c458d96..df17201 100644
--- a/zfgrep.in
+++ b/zfgrep.in
@@ -4,4 +4,4 @@ case $1 in
--__bindir) bindir=${2?}; shift; shift;;
esac
PATH=$bindir:$PATH
-exec zgrep -F "$@"
+exec zgrep --__bindir "$bindir" -F "$@"