From 61940a9c0666eba8be21de4f1cd182912f74f929 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sat, 2 Mar 2019 15:40:05 +0100 Subject: [PATCH] Include rendered man page in source tarballs This gives users who build from the source tarball, but do not want to install pandoc, access to the man pages. Apperently the gocryptfs homebrew package ships without the man pages at the moment to avoid pandoc. Requested at https://github.com/rfjakob/gocryptfs/issues/355 --- Documentation/MANPAGE-render.bash | 2 +- package-source.bash | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Documentation/MANPAGE-render.bash b/Documentation/MANPAGE-render.bash index cc982aa..996290a 100755 --- a/Documentation/MANPAGE-render.bash +++ b/Documentation/MANPAGE-render.bash @@ -8,7 +8,7 @@ function render { IN=$1 OUT=$2 echo "Rendering $IN to $OUT" - echo ".\\\" This is a man page. View it using 'man ./$OUT'" > $OUT + echo ".\\\" This man page was generated from $IN. View it using 'man ./$OUT'" > $OUT echo ".\\\"" >> $OUT pandoc "$IN" -s -t man >> $OUT } diff --git a/package-source.bash b/package-source.bash index 772dfef..1b54301 100755 --- a/package-source.bash +++ b/package-source.bash @@ -18,14 +18,18 @@ cd "$(dirname "$0")" GITVERSION=$(git describe --tags --dirty) echo $GITVERSION > VERSION +# Render the manpages and include them in the tarball. This +# avoids a build-dependency to pandoc. +./Documentation/MANPAGE-render.bash + # gocryptfs source tarball PREFIX_SRC_ONLY=gocryptfs_${GITVERSION}_src -git_archive_extra $PREFIX_SRC_ONLY VERSION +git_archive_extra $PREFIX_SRC_ONLY VERSION Documentation/*.1 # gocryptfs source + dependencies tarball dep ensure PREFIX_SRC_DEPS=gocryptfs_${GITVERSION}_src-deps -git_archive_extra $PREFIX_SRC_DEPS VERSION vendor +git_archive_extra $PREFIX_SRC_DEPS VERSION Documentation/*.1 vendor rm VERSION