Thread (7 messages) flat view 7 messages, 4 authors, 2016-06-15

Re: [PATCH] catch asciidoc failures

From: Jonas Fonseca <hidden>
Date: 2016-06-15 22:43:13

On 6/1/07, Martin Waitz [off-list ref] wrote:
On Thu, May 31, 2007 at 11:23:57PM -0700, Scott Lamb wrote:
quoted
If pipefail is available (GNU bash >= 3.00), fail when asciidoc returns
error rather than possibly later during XSLT.
perhaps we should simply change the pipe ordering to get asciidoc
to the end of the pipeline so that all shells respect its exit code?
For tig I also adopted the nice man page headers git has. However, I have
used  asciidoc attributes provided on the command line avoid having to
use sed. I can make a patch later if nobody beats me. The required changes
are outlined below.
quoted
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -111,6 +111,7 @@ clean:

 %.html : %.txt
      rm -f $@+ $@
+     set -o pipefail 2>/dev/null; \
      $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
              $(ASCIIDOC_EXTRA) -o - $< | \
              sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' >$@+
something like (untested):
        sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' $< |
                $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
                        $(ASCIIDOC_EXTRA) -o $@+ -
More untested stuff. Use -a to define git_version attribute:

$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
                         $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@ $<

Then change the @@GIT_VERSION@@ symbol in asciidoc.conf to {git_version}.

-- 
Jonas Fonseca
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help