From 2dcbb6405887ec05731bf359266f45b0a5ef4e49 Mon Sep 17 00:00:00 2001 From: Eric F Crist Date: Wed, 18 May 2022 08:08:25 -0500 Subject: [PATCH] update python call, remove test pki on build Helps with preventing #571 again by removing the test pki that may exist. The build script now removes it if present. Update the python call the python3 so it works on macOS like in master. Signed-off-by: Eric F Crist --- build/build-dist.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/build-dist.sh b/build/build-dist.sh index b152da1..e0e16be 100755 --- a/build/build-dist.sh +++ b/build/build-dist.sh @@ -63,6 +63,12 @@ dist_clean() { "$DISTCLEAN" rm -rf "$DIST_ROOT" || die "dist_clean failed to rm" fi + # remove any test pki paths in easyrsa path + + if [ -d "easyrsa3/pki" ]; then + echo "Found test pki, removing..." + rm -rf easyrsa3/pki + fi mkdir -p "$DIST_ROOT" || die "dist_clean failed to mkdir" } @@ -104,7 +110,7 @@ stage_win() { # FreeBSD does not accept -i without argument in a way also acceptable by GNU sed sed -i.tmp -e "s/~~~/$VERSION/" "$SRC_ROOT/$f" || die "Cannot update easyrsa version" rm -f "$SRC_ROOT/$f.tmp" - python -m markdown "$SRC_ROOT/$f" > "$DIST_ROOT/$win/$PV/${f%.md}.html" || die "Failed to convert markdown to HTML" + python3 -m markdown "$SRC_ROOT/$f" > "$DIST_ROOT/$win/$PV/${f%.md}.html" || die "Failed to convert markdown to HTML" done # Copy files into $PV, starting with easyrsa3 as the initial root dir