From 2bf4f2781b7f94114df32005035c36a1561e9d61 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 19 Apr 2017 13:56:32 +1200 Subject: [PATCH] [manpage] Handle build numbers in versions --- contrib/devtools/gen-manpages.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 24571481..be54bc1d 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -11,7 +11,9 @@ ZCASHTX=${ZCASHTX:-$SRCDIR/zcash-tx} [ ! -x $ZCASHD ] && echo "$ZCASHD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -ZECVER=($($ZCASHCLI --version | head -n1 | awk -F'[ -]' '{ print $5, $6 }')) +ZECVERSTR=$($ZCASHCLI --version | head -n1 | awk '{ print $NF }') +ZECVER=$(echo $ZECVERSTR | awk -F- '{ OFS="-"; NF--; print $0; }') +ZECCOMMIT=$(echo $ZECVERSTR | awk -F- '{ print $NF }') # Create a footer file with copyright content. # This gets autodetected fine for zcashd if --version-string is not set, @@ -21,8 +23,8 @@ $ZCASHD --version | sed -n '1!p' >> footer.h2m for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do cmdname="${cmd##*/}" - help2man -N --version-string=${ZECVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} - sed -i "s/\\\-${ZECVER[1]}//g" ${MANDIR}/${cmdname}.1 + help2man -N --version-string=$ZECVER --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} + sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1 done rm -f footer.h2m