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

Fix minor build-dist.sh issues

Browse Source 
* Use ~KEY~ pattern for replacement instead of ~~~, which doesn't scale.
* Include an empty string following -i for sed.  This prevents the extra
files from showing up with -e.

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2018-10-02 10:34:50 -05:00
parent 3792c9eafd
commit 7122f514c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build-dist.sh
View File

@ -78,7 +78,7 @@ stage_unix() {
cp -R "$SRC_ROOT/doc" "$DIST_ROOT/unix/$PV/" || die "failed to copy unix doc" cp -R "$SRC_ROOT/doc" "$DIST_ROOT/unix/$PV/" || die "failed to copy unix doc"
sed -i -e "s/~~~/$VERSION/" "$DIST_ROOT/unix/$PV/easyrsa" sed -I -e "s/~~~/$VERSION/" "$DIST_ROOT/unix/$PV/easyrsa"
# files not included # files not included
rm -rf "$DIST_ROOT/unix/$PV/doc/TODO" || die "failed rm TODO" rm -rf "$DIST_ROOT/unix/$PV/doc/TODO" || die "failed rm TODO"
@ -94,7 +94,7 @@ stage_win() {
for f in $SRC_ROOT/doc/*.md; for f in $SRC_ROOT/doc/*.md;
do do
fname=$(basename "$f" .md) fname=$(basename "$f" .md)
sed -i -e "s/~~~/$VERSION/" "$SRC_ROOT/$f" sed -I -e "s/~~~/$VERSION/" "$SRC_ROOT/$f"
python -m markdown "$f" > "$DIST_ROOT/windows/$PV/doc/$fname.html" python -m markdown "$f" > "$DIST_ROOT/windows/$PV/doc/$fname.html"
done done

2
easyrsa3/easyrsa
View File

@ -1196,7 +1196,7 @@ Note: using Easy-RSA configuration from: $vars"
set_var EASYRSA_CERT_EXPIRE 1080 # new default of 36 months set_var EASYRSA_CERT_EXPIRE 1080 # new default of 36 months
set_var EASYRSA_CRL_DAYS 180 set_var EASYRSA_CRL_DAYS 180
set_var EASYRSA_NS_SUPPORT no set_var EASYRSA_NS_SUPPORT no
set_var EASYRSA_NS_COMMENT "Easy-RSA (~~~) Generated Certificate" set_var EASYRSA_NS_COMMENT "Easy-RSA (~VER~) Generated Certificate"
set_var EASYRSA_TEMP_CONF "$EASYRSA_PKI/openssl-easyrsa.temp" set_var EASYRSA_TEMP_CONF "$EASYRSA_PKI/openssl-easyrsa.temp"
set_var EASYRSA_TEMP_EXT "$EASYRSA_PKI/extensions.temp" set_var EASYRSA_TEMP_EXT "$EASYRSA_PKI/extensions.temp"
set_var EASYRSA_TEMP_FILE_2 "" set_var EASYRSA_TEMP_FILE_2 ""