From 7d86103f231e8dea3c1c0ef1a23d26a4e0fae7b5 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 13 Nov 2019 09:37:20 +0300
Subject: [PATCH] Include supplementary_files.sh in makedist.sh

---
 makedist.sh            | 73 ++++++++++++++++++++++++++++++++++++++----
 supplementary_files.sh | 60 ----------------------------------
 2 files changed, 67 insertions(+), 66 deletions(-)
 delete mode 100755 supplementary_files.sh

diff --git a/makedist.sh b/makedist.sh
index 3086385..ac305c8 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -88,12 +88,73 @@ You can obtain releases source code prepared tarballs on
 @url{http://www.nncpgo.org/}.
 EOF
 make -C doc
-./supplementary_files.sh
-rm -r \
-    doc/.gitignore \
-    doc/.well-known \
-    doc/nncp.html/.well-known \
-    supplementary_files.sh
+
+########################################################################
+# Supplementary files autogeneration
+########################################################################
+texi=`mktemp`
+
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle NEWS
+
+@node News
+@unnumbered News
+
+`sed -n '5,$p' < doc/news.texi`
+
+@bye
+EOF
+makeinfo --plaintext -o NEWS $texi
+
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle NEWS.RU
+
+@node Новости
+@unnumbered Новости
+
+`sed -n '3,$p' < doc/news.ru.texi | sed 's/^@subsection/@section/'`
+
+@bye
+EOF
+makeinfo --plaintext -o NEWS.RU $texi
+
+rm -f $texi
+
+texi=$(TMPDIR=doc mktemp)
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle INSTALL
+
+@include install.texi
+
+@bye
+EOF
+makeinfo --plaintext -o INSTALL $texi
+rm -f $texi
+
+texi=`mktemp`
+
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle THANKS
+
+`cat doc/thanks.texi`
+
+@bye
+EOF
+makeinfo --plaintext -o THANKS $texi
+rm -f $texi
+
+########################################################################
+
+mv doc/.well-known/openpgpkey/hu/i4cdqgcarfjdjnba6y4jnf498asg8c6p.asc PUBKEY.asc
+rm -r doc/.gitignore doc/.well-known doc/nncp.html/.well-known
 
 find . -type d -exec chmod 700 {} \;
 find . -type f -exec chmod 600 {} \;
diff --git a/supplementary_files.sh b/supplementary_files.sh
deleted file mode 100755
index 5fce6c1..0000000
--- a/supplementary_files.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-texi=`mktemp`
-
-cat > $texi <<EOF
-\input texinfo
-@documentencoding UTF-8
-@settitle NEWS
-
-@node News
-@unnumbered News
-
-`sed -n '5,$p' < doc/news.texi`
-
-@bye
-EOF
-makeinfo --plaintext -o NEWS $texi
-
-cat > $texi <<EOF
-\input texinfo
-@documentencoding UTF-8
-@settitle NEWS.RU
-
-@node Новости
-@unnumbered Новости
-
-`sed -n '3,$p' < doc/news.ru.texi | sed 's/^@subsection/@section/'`
-
-@bye
-EOF
-makeinfo --plaintext -o NEWS.RU $texi
-
-rm -f $texi
-
-texi=$(TMPDIR=doc mktemp)
-cat > $texi <<EOF
-\input texinfo
-@documentencoding UTF-8
-@settitle INSTALL
-
-@include install.texi
-
-@bye
-EOF
-makeinfo --plaintext -o INSTALL $texi
-rm -f $texi
-
-texi=`mktemp`
-
-cat > $texi <<EOF
-\input texinfo
-@documentencoding UTF-8
-@settitle THANKS
-
-`cat doc/thanks.texi`
-
-@bye
-EOF
-makeinfo --plaintext -o THANKS $texi
-rm -f $texi
-- 
2.44.0