]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Change make doc command to work with bsd sed
authorHiroshi Shirosaki <h.shirosaki@gmail.com>
Sat, 30 Jan 2016 23:01:10 +0000 (08:01 +0900)
committerHiroshi Shirosaki <h.shirosaki@gmail.com>
Sat, 30 Jan 2016 23:01:10 +0000 (08:01 +0900)
Makefile

index 9eb40e2b10be4f9f2724f0c10e2e99bff7d139bd..82fb27ffa394e1d4defb7f2a19597ff46b84e5c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,14 +47,18 @@ build:
        mkdir build
 
 doc: build/html2vimdoc build/vim-tools
-       sed '/^\(\[!\[Build Status\]\|1. \[\)/d' README.md > doc/tmp.md
+       sed -e '/^\[!\[Build Status\]/d' \
+           -e '/^1\. \[/d' README.md > doc/tmp.md # remove table of contents
        build/html2vimdoc/bin/python build/vim-tools/html2vimdoc.py -f vim-markdown \
                doc/tmp.md | \
-               sed -e "s/\s*$$//; # remove trailing spaces" \
-                   -e "/^- '[^']*':\( \|$$\)/ { # match command lines" \
-                   -e "s/^- '\([^']*\)':\( \|$$\)/ \*\1\*\n\0/; # make command references" \
-                   -e ":a; s/^\(.\{1,78\}\n\)/ \1/; ta } # right align references" \
-               > doc/vim-markdown.txt && rm -f doc/tmp.md
+               sed -E -e "s/[[:space:]]*$$//" -e "# remove trailing spaces" \
+                   -e "/^- '[^']*':( |$$)/ {" \
+                   -e "h" -e "# save the matched line to the hold space"\
+                   -e "s/^- '([^']*)':.*/ \*\1\*/" -e "# make command reference" \
+                   -e ":a" -e "s/^(.{1,78})$$/ \1/" -e "ta" -e "# align right" \
+                   -e "G" -e "# append the matched line after the command reference" \
+                   -e "}" > doc/vim-markdown.txt && rm -f doc/tmp.md
+
 .PHONY: doc
 
 # Prerequire Python and virtualenv.