Select correct version of welcome.rtf

This commit is contained in:
twangboy 2019-01-31 17:19:27 -07:00
parent 00794a208c
commit c40ae65c48
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 6 additions and 1 deletions

View file

@ -158,10 +158,15 @@ echo -n -e "\033]0;Build_Pkg: Add Version to .xml\007"
if [ "$PYVER" == "2" ]; then
TITLE="Salt $VERSION"
DESC="Salt $VERSION with Python 2"
SEDSTR="s/@PY@@/_py2/g"
else
TITLE="Salt $VERSION (Python 3)"
DESC="Salt $VERSION with Python 3"
SEDSTR="s/@PY@@//g"
fi
# Select the appropriate welcome text
# This is only necessary until Sodium, then this can be removed
sed -E -i '' "$SEDSTR" distribution.xml
cd $PKGRESOURCES
cp distribution.xml.dist distribution.xml

View file

@ -17,7 +17,7 @@
scaling="proportional"
alignment="bottomleft" />
<!-- Define documents displayed at various steps -->
<welcome file="welcome.rtf"
<welcome file="welcome@PY2@.rtf"
mime-type="text/rtf" />
<license file="license.rtf"
mime-type="text/rtf" />