Drop contrib + non-free from default COMPONENTS, support --contrib + -non-free cmdlin...

[grml-debootstrap.git] / Makefile

diff --git a/Makefile b/Makefile
index a1493bf..9e17781 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+BASH_SCRIPTS = grml-debootstrap
+SHELL_SCRIPTS = chroot-script
+MKSH_SCRIPTS = bootgrub.mksh
+
 all: doc
 
 doc: doc_man doc_html
@@ -14,21 +18,34 @@ doc_man: man-stamp
 man-stamp: grml-debootstrap.8.txt
        sed -i 's/^include::releasetable.txt\[\]/include::releasetable-man.txt\[\]/' grml-debootstrap.8.txt
        asciidoc -d manpage -b docbook grml-debootstrap.8.txt
-       sed -i 's/<emphasis role="strong">/<emphasis role="bold">/' grml-debootstrap.8.xml
-       xsltproc /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl grml-debootstrap.8.xml
-       # ugly hack to avoid duplicate empty lines in manpage
-       # notice: docbook-xsl 1.71.0.dfsg.1-1 is broken! make sure you use 1.68.1.dfsg.1-0.2!
-       cp grml-debootstrap.8 grml-debootstrap.8.tmp
-       uniq grml-debootstrap.8.tmp > grml-debootstrap.8
-       # ugly hack to avoid '.sp' at the end of a sentence or paragraph:
-       sed -i 's/\.sp$//' grml-debootstrap.8
-       rm grml-debootstrap.8.tmp
+       xsltproc --stringparam man.base.url.for.relative.links http://grml.org/grml-debootstrap/ \
+               /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl grml-debootstrap.8.xml
        touch man-stamp
 
-online: all
-       scp grml-debootstrap.8.html grml:/var/www/grml/grml-debootstrap/index.html
-       scp images/icons/*          grml:/var/www/grml/grml-debootstrap/images/icons/
-       scp images/screenshot.png   grml:/var/www/grml/grml-debootstrap/images/
+shellcheck:
+       @echo -n "Checking for shell syntax errors"; \
+       for SCRIPT in $(SHELL_SCRIPTS); do \
+               test -r $${SCRIPT} || continue ; \
+               sh -n $${SCRIPT} || exit ; \
+               echo -n "."; \
+       done; \
+       for SCRIPT in $(BASH_SCRIPTS) ; do \
+               test -r $${SCRIPT} || continue ; \
+               bash -n $${SCRIPT} || exit ; \
+               echo -n "."; \
+       done; \
+       for SCRIPT in $(MKSH_SCRIPTS) ; do \
+               test -r $${SCRIPT} || continue ; \
+               mksh -n $${SCRIPT} || exit ; \
+               echo -n "."; \
+       done; \
+       echo " done."
 
 clean:
        rm -rf grml-debootstrap.8.html grml-debootstrap.8.xml grml-debootstrap.8 html-stamp man-stamp
+
+testrun:
+       cd ./packer && $(MAKE) compile && $(MAKE) packer
+
+vagrant:
+       vagrant up