grep branch, master, updated. v2.18-33-gddea6c8

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  ddea6c8ea3529f3364257e0e239775c63bf1b95d (commit)
      from  92956f9eafd470076170c05953c45dcbb41e7bd8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=ddea6c8ea3529f3364257e0e239775c63bf1b95d


commit ddea6c8ea3529f3364257e0e239775c63bf1b95d
Author: Paul Eggert <address@hidden>
Date:   Wed Mar 26 21:30:26 2014 -0700

    egrep, fgrep: improve diagnostics from shell scripts
    
    This should fix Bug#17098.
    * src/Makefile.am (EXTRA_DIST): Add egrep.sh.
    (egrep fgrep): Depend on egrep.sh and Makefile.
    Build from new file egrep.sh, as this makes the build process
    easier to follow.  Arrange for $0 to look nicer in subgrep.
    * src/egrep.sh: New file.

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b5a365..27a2bc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,19 +42,14 @@ grep_LDADD = $(LDADD) $(LIB_PCRE)
 localedir = $(datadir)/locale
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 
-EXTRA_DIST = dosbuf.c
+EXTRA_DIST = dosbuf.c egrep.sh
 
-egrep fgrep:
+egrep fgrep: egrep.sh Makefile
        $(AM_V_GEN)grep=`echo grep | sed -e '$(transform)'`     && \
        case $@ in egrep) option=-E;; fgrep) option=-F;; esac   && \
-       (echo '#!$(SHELL)'                                      && \
-        echo 'grep=grep'                                       && \
-        echo 'case $$0 in */*)'                                && \
-        echo '  g=$${0%/*}/'"'$$grep'"                         && \
-        echo '  test -x "$$g" && grep=$$g'                     && \
-        echo 'esac'                                            && \
-        echo 'exec "$$grep" '"$$option"' "$$@"'        \
-       ) >address@hidden
+       sed -e 's|address@hidden@|$(SHELL)|g' \
+           -e "s|address@hidden@|$$grep|g" \
+           -e "s|address@hidden@|$$option|g" <egrep.sh >address@hidden
        $(AM_V_at)chmod +x address@hidden
        $(AM_V_at)mv address@hidden $@
 
diff --git a/src/egrep.sh b/src/egrep.sh
new file mode 100644
index 0000000..f1b4146
--- /dev/null
+++ b/src/egrep.sh
@@ -0,0 +1,10 @@
address@hidden@
+grep=grep
+case $0 in
+  */*)
+    if test -x "${0%/*}/@grep@"; then
+      PATH=${0%/*}:$PATH
+      address@hidden@
+    fi;;
+esac
+exec $grep @option@ "$@"

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am |   15 +++++----------
 src/egrep.sh    |   10 ++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 src/egrep.sh


hooks/post-receive
-- 
grep