summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcheck45
-rw-r--r--subplot.md12
-rw-r--r--subplot.subplot10
3 files changed, 31 insertions, 36 deletions
diff --git a/check b/check
index 11b7d77..0b2b460 100755
--- a/check
+++ b/check
@@ -4,24 +4,21 @@
set -eu -o pipefail
-cat_with_sep()
-{
- for x in "$@"
- do
- cat "$x"
- echo
- done
+cat_with_sep() {
+ for x in "$@"; do
+ cat "$x"
+ echo
+ done
}
hideok=chronic
-if [ "$#" -gt 0 ]
-then
- case "$1" in
+if [ "$#" -gt 0 ]; then
+ case "$1" in
verbose | -v | --verbose)
- hideok=
- shift 1
- ;;
- esac
+ hideok=
+ shift 1
+ ;;
+ esac
fi
dir="$(mktemp -d -p .)"
@@ -29,24 +26,24 @@ dir="$(mktemp -d -p .)"
trap 'rm -rf "$dir"' EXIT
rm -f test.log test.py
-cp subplot.md "$dir"
-cat_with_sep subplot.md roles/*/subplot.md > "$dir/subplot.md"
-cat_with_sep subplot/*.py roles/*/subplot.py > "$dir/subplot.py"
-cat_with_sep subplot/*.yaml roles/*/subplot.yaml > "$dir/subplot.yaml"
+cp subplot.subplot subplot.md "$dir"
+cat_with_sep subplot.md roles/*/subplot.md >"$dir/subplot.md"
+cat_with_sep subplot/*.py roles/*/subplot.py >"$dir/subplot.py"
+cat_with_sep subplot/*.yaml roles/*/subplot.yaml >"$dir/subplot.yaml"
(
- set -eu -o pipefail
- cd "$dir"
- subplot docgen subplot.md -o ../subplot.pdf
- subplot docgen subplot.md -o ../subplot.html
- subplot codegen subplot.md -o ../test.py
+ set -eu -o pipefail
+ cd "$dir"
+ subplot docgen subplot.subplot -o ../subplot.pdf
+ subplot docgen subplot.subplot -o ../subplot.html
+ subplot codegen subplot.subplot -o ../test.py
)
# Fix private key permissions. git doesn't preserve them.
chmod 0600 ssh/id
# Create configuration for the test VMs used by the test suite.
-cat > test.cfg <<EOF
+cat >test.cfg <<EOF
name: debian-ansible-test
base_image: "$HOME/tmp/debian-10-openstack-amd64.qcow2"
username: debian
diff --git a/subplot.md b/subplot.md
index 952ba95..a56e15b 100644
--- a/subplot.md
+++ b/subplot.md
@@ -1,15 +1,3 @@
----
-title: "debian-ansible&mdash;Ansible roles for Debian systems"
-author: Lars Wirzenius
-bindings:
-- subplot.yaml
-impls:
- python:
- - subplot.py
- - lib/runcmd.py
-...
-
-
# Introduction
`debian-ansible` is a collection of Ansible roles for managing Debian
diff --git a/subplot.subplot b/subplot.subplot
new file mode 100644
index 0000000..7cc234d
--- /dev/null
+++ b/subplot.subplot
@@ -0,0 +1,10 @@
+title: "debian-ansible&mdash;Ansible roles for Debian systems"
+author: Lars Wirzenius
+markdowns:
+ - subplot.md
+bindings:
+- subplot.yaml
+impls:
+ python:
+ - subplot.py
+ - lib/runcmd.py