bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure better text editor automatic filetype detection

Browse source 
Since we no longer use vim-specific modelines, use the .asciidoc file
extension which is, well, reserved for asciidoc formatted files. This
should presumably work everywhere without needing editor-specific
workarounds and configuration.

Also add a shebang to makepkg.conf to indicate it contains bash content.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2018-05-03 00:10:21 -04:00 • committed by Allan McRae
parent 860e4c4943
commit 076b6184de
19 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/BUILDINFO.5.txt → doc/BUILDINFO.5.asciidoc
View file

@ -67,4 +67,4 @@ See Also
-------- --------
linkman:makepkg[8], linkman:pacman[8], linkman:makepkg.conf[5] linkman:makepkg[8], linkman:pacman[8], linkman:makepkg.conf[5]
include::footer.txt[] include::footer.asciidoc[]

68
doc/Makefile.am
View file

@ -47,24 +47,24 @@ HTML_DOCS = \
EXTRA_DIST = \ EXTRA_DIST = \
asciidoc.conf \ asciidoc.conf \
asciidoc-override.css \ asciidoc-override.css \
alpm-hooks.5.txt \ alpm-hooks.5.asciidoc \
pacman.8.txt \ pacman.8.asciidoc \
makepkg.8.txt \ makepkg.8.asciidoc \
makepkg-template.1.txt \ makepkg-template.1.asciidoc \
repo-add.8.txt \ repo-add.8.asciidoc \
vercmp.8.txt \ vercmp.8.asciidoc \
pkgdelta.8.txt \ pkgdelta.8.asciidoc \
pacman-key.8.txt \ pacman-key.8.asciidoc \
PKGBUILD.5.txt \ PKGBUILD.5.asciidoc \
PKGBUILD-example.txt \ PKGBUILD-example.txt \
makepkg.conf.5.txt \ makepkg.conf.5.asciidoc \
pacman.conf.5.txt \ pacman.conf.5.asciidoc \
BUILDINFO.5.txt \ BUILDINFO.5.asciidoc \
libalpm.3.txt \ libalpm.3.asciidoc \
footer.txt \ footer.asciidoc \
index.txt \ index.asciidoc \
submitting-patches.txt \ submitting-patches.asciidoc \
translation-help.txt \ translation-help.asciidoc \
Doxyfile \ Doxyfile \
$(ASCIIDOC_MANS) \ $(ASCIIDOC_MANS) \
$(DOXYGEN_MANS) $(DOXYGEN_MANS)
@ -130,11 +130,11 @@ A2X_OPTS = \
--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
# These rules are due to the includes and files of the asciidoc text # These rules are due to the includes and files of the asciidoc text
$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile.am $(ASCIIDOC_MANS): asciidoc.conf footer.asciidoc Makefile.am
$(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt $(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.asciidoc
%.html: %.txt %.html: %.asciidoc
$(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.txt | \ $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.asciidoc | \
sed -e 's/\r$$//' > $@ sed -e 's/\r$$//' > $@
HACKING.html: ../HACKING HACKING.html: ../HACKING
@ -142,7 +142,7 @@ HACKING.html: ../HACKING
sed -e 's/\r$$//' > $@ sed -e 's/\r$$//' > $@
# Customizations for certain HTML docs # Customizations for certain HTML docs
$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile.am $(HTML_MANPAGES): asciidoc.conf footer.asciidoc Makefile.am
$(HTML_OTHER): asciidoc.conf Makefile.am $(HTML_OTHER): asciidoc.conf Makefile.am
%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css %.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css
%.8.html: ASCIIDOC_OPTS += -d manpage %.8.html: ASCIIDOC_OPTS += -d manpage
@ -150,18 +150,18 @@ $(HTML_OTHER): asciidoc.conf Makefile.am
%.3.html: ASCIIDOC_OPTS += -d manpage %.3.html: ASCIIDOC_OPTS += -d manpage
# Dependency rules # Dependency rules
alpm-hooks.5 alpm-hooks.5.html: alpm-hooks.5.txt alpm-hooks.5 alpm-hooks.5.html: alpm-hooks.5.asciidoc
pacman.8 pacman.8.html: pacman.8.txt pacman.8 pacman.8.html: pacman.8.asciidoc
makepkg.8 makepkg.8.html: makepkg.8.txt makepkg.8 makepkg.8.html: makepkg.8.asciidoc
makepkg-template.1 makepkg-template.1.html: makepkg-template.1.txt makepkg-template.1 makepkg-template.1.html: makepkg-template.1.asciidoc
repo-add.8 repo-add.8.html: repo-add.8.txt repo-add.8 repo-add.8.html: repo-add.8.asciidoc
vercmp.8 vercmp.8.html: vercmp.8.txt vercmp.8 vercmp.8.html: vercmp.8.asciidoc
pkgdelta.8 pkgdelta.8.html: pkgdelta.8.txt pkgdelta.8 pkgdelta.8.html: pkgdelta.8.asciidoc
pacman-key.8 pacman-key.8.html: pacman-key.8.txt pacman-key.8 pacman-key.8.html: pacman-key.8.asciidoc
PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.txt PKGBUILD-example.txt PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.asciidoc PKGBUILD-example.txt
makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.txt makepkg.conf.5 makepkg.conf.5.html: makepkg.conf.5.asciidoc
pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt pacman.conf.5 pacman.conf.5.html: pacman.conf.5.asciidoc
libalpm.3 libalpm.3.html: libalpm.3.txt libalpm.3 libalpm.3.html: libalpm.3.asciidoc
# this one is just a symlink # this one is just a symlink
repo-remove.8: repo-add.8 repo-remove.8: repo-add.8
$(RM) repo-remove.8 $(RM) repo-remove.8

2
doc/PKGBUILD.5.txt → doc/PKGBUILD.5.asciidoc
View file

@ -522,4 +522,4 @@ See Also
-------- --------
linkman:makepkg[8], linkman:pacman[8], linkman:makepkg.conf[5] linkman:makepkg[8], linkman:pacman[8], linkman:makepkg.conf[5]
include::footer.txt[] include::footer.asciidoc[]

2
doc/alpm-hooks.5.txt → doc/alpm-hooks.5.asciidoc
View file

@ -125,4 +125,4 @@ or not they were actually present on the file system before package removal.
PostTransaction hooks will *not* run if the transaction fails to complete for PostTransaction hooks will *not* run if the transaction fails to complete for
any reason. any reason.
include::footer.txt[] include::footer.asciidoc[]

0
doc/footer.txt → doc/footer.asciidoc
View file

0
doc/index.txt → doc/index.asciidoc
View file

2
doc/libalpm.3.txt → doc/libalpm.3.asciidoc
View file

@ -34,4 +34,4 @@ See Also
linkman:alpm-hooks[5], linkman:makepkg[8], linkman:pacman[8], linkman:alpm-hooks[5], linkman:makepkg[8], linkman:pacman[8],
linkman:pacman.conf[5] linkman:pacman.conf[5]
include::footer.txt[] include::footer.asciidoc[]

2
doc/makepkg-template.1.txt → doc/makepkg-template.1.asciidoc
View file

@ -115,4 +115,4 @@ See Also
-------- --------
linkman:makepkg[8], linkman:PKGBUILD[5] linkman:makepkg[8], linkman:PKGBUILD[5]
include::footer.txt[] include::footer.asciidoc[]

2
doc/makepkg.8.txt → doc/makepkg.8.asciidoc
View file

@ -346,4 +346,4 @@ See Also
-------- --------
linkman:makepkg.conf[5], linkman:PKGBUILD[5], linkman:pacman[8] linkman:makepkg.conf[5], linkman:PKGBUILD[5], linkman:pacman[8]
include::footer.txt[] include::footer.asciidoc[]

2
doc/makepkg.conf.5.txt → doc/makepkg.conf.5.asciidoc
View file

@ -266,4 +266,4 @@ See Also
-------- --------
linkman:makepkg[8], linkman:pacman[8], linkman:PKGBUILD[5] linkman:makepkg[8], linkman:pacman[8], linkman:PKGBUILD[5]
include::footer.txt[] include::footer.asciidoc[]

2
doc/pacman-key.8.txt → doc/pacman-key.8.asciidoc
View file

@ -142,4 +142,4 @@ See Also
-------- --------
linkman:pacman[8], linkman:pacman.conf[5] linkman:pacman[8], linkman:pacman.conf[5]
include::footer.txt[] include::footer.asciidoc[]

2
doc/pacman.8.txt → doc/pacman.8.asciidoc
View file

@ -565,4 +565,4 @@ See Also
linkman:alpm-hooks[5], linkman:libalpm[3], linkman:makepkg[8], linkman:alpm-hooks[5], linkman:libalpm[3], linkman:makepkg[8],
linkman:pacman.conf[5] linkman:pacman.conf[5]
include::footer.txt[] include::footer.asciidoc[]

2
doc/pacman.conf.5.txt → doc/pacman.conf.5.asciidoc
View file

@ -368,4 +368,4 @@ See Also
-------- --------
linkman:pacman[8], linkman:libalpm[3] linkman:pacman[8], linkman:libalpm[3]
include::footer.txt[] include::footer.asciidoc[]

2
doc/pkgdelta.8.txt → doc/pkgdelta.8.asciidoc
View file

@ -50,4 +50,4 @@ See Also
-------- --------
linkman:pacman[8], linkman:xdelta3[1] linkman:pacman[8], linkman:xdelta3[1]
include::footer.txt[] include::footer.asciidoc[]

2
doc/repo-add.8.txt → doc/repo-add.8.asciidoc
View file

@ -91,4 +91,4 @@ See Also
-------- --------
linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8] linkman:makepkg[8], linkman:pacman[8], linkman:pkgdelta[8]
include::footer.txt[] include::footer.asciidoc[]

0
doc/submitting-patches.txt → doc/submitting-patches.asciidoc
View file

0
doc/translation-help.txt → doc/translation-help.asciidoc
View file

2
doc/vercmp.8.txt → doc/vercmp.8.asciidoc
View file

@ -69,4 +69,4 @@ See Also
-------- --------
linkman:pacman[8], linkman:makepkg[8], linkman:libalpm[3] linkman:pacman[8], linkman:makepkg[8], linkman:libalpm[3]
include::footer.txt[] include::footer.asciidoc[]

1
etc/makepkg.conf.in
View file

@ -1,3 +1,4 @@
#!/hint/bash
# #
# @sysconfdir@/makepkg.conf # @sysconfdir@/makepkg.conf
# #