From 5ec9af2676725d83af78c4f4b4d31ed5b46bfdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= Date: Wed, 16 Nov 2016 17:05:56 +0200 Subject: [PATCH 1/2] Fix build-dist.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script had been broken since COPYING was converted to COPYING.md Signed-off-by: Samuli Seppänen --- build/build-dist.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/build-dist.sh b/build/build-dist.sh index dca4b9a..22276af 100755 --- a/build/build-dist.sh +++ b/build/build-dist.sh @@ -67,7 +67,7 @@ stage_unix() { mkdir -p "$DIST_ROOT/unix/$PV" # Copy files into $PV, starting with easyrsa3 as the initial root dir - src_files="easyrsa3/ Licensing/ COPYING ChangeLog README.quickstart.md" + src_files="easyrsa3/ Licensing/ COPYING.md ChangeLog README.quickstart.md" for f in $src_files do cp -a "$SRC_ROOT/$f" "$DIST_ROOT/unix/$PV" || die "failed to copy $f" @@ -92,9 +92,12 @@ stage_win() { python -m markdown $f > $DIST_ROOT/windows/$PV/doc/$fname.html done - python -m markdown $SRC_ROOT/README.quickstart.md > $DIST_ROOT/windows/$PV/README.quickstart.html + for f in "README.quickstart" "COPYING" + do + python -m markdown $SRC_ROOT/$f.md > $DIST_ROOT/windows/$PV/$f.html + done # Copy files into $PV, starting with easyrsa3 as the initial root dir - src_files="easyrsa3/ COPYING ChangeLog" + src_files="easyrsa3/ ChangeLog" for f in $src_files do cp -a "$SRC_ROOT/$f" "$DIST_ROOT/windows/$PV" || die "failed to copy $f" From 6ba06da8da6d9fbcdedb4eb8c96ec4563ee67185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= Date: Wed, 16 Nov 2016 17:14:21 +0200 Subject: [PATCH 2/2] Include README.md in dist packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuli Seppänen --- build/build-dist.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/build-dist.sh b/build/build-dist.sh index 22276af..be2cb9b 100755 --- a/build/build-dist.sh +++ b/build/build-dist.sh @@ -67,7 +67,7 @@ stage_unix() { mkdir -p "$DIST_ROOT/unix/$PV" # Copy files into $PV, starting with easyrsa3 as the initial root dir - src_files="easyrsa3/ Licensing/ COPYING.md ChangeLog README.quickstart.md" + src_files="easyrsa3/ Licensing/ COPYING.md ChangeLog README.md README.quickstart.md" for f in $src_files do cp -a "$SRC_ROOT/$f" "$DIST_ROOT/unix/$PV" || die "failed to copy $f" @@ -92,7 +92,7 @@ stage_win() { python -m markdown $f > $DIST_ROOT/windows/$PV/doc/$fname.html done - for f in "README.quickstart" "COPYING" + for f in "README" "README.quickstart" "COPYING" do python -m markdown $SRC_ROOT/$f.md > $DIST_ROOT/windows/$PV/$f.html done