nik/easyrsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update python call, remove test pki on build

Browse Source 
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 <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2022-05-18 08:08:25 -05:00
parent 150e96ec9b
commit 2dcbb64058
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/build-dist.sh
View File

@ -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