napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: use explicit encoding in XML tidy

Browse Source
This commit is contained in:
Adriaan de Groot 2020-01-25 17:13:49 +01:00
parent 053fa28b19
commit 64b56664de
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/txcheck.sh
View File

@ -79,7 +79,7 @@ tx_sum()
# Clean up the TS (XML) files (like txpush would) # Clean up the TS (XML) files (like txpush would)
TS_FILE="$WORKTREE_NAME/lang/calamares_en.ts" TS_FILE="$WORKTREE_NAME/lang/calamares_en.ts"
if test -n "$XMLLINT" ; then if test -n "$XMLLINT" ; then
$XMLLINT --format -o "$TS_FILE".new "$TS_FILE" && mv "$TS_FILE".new "$TS_FILE" $XMLLINT --format --encode utf-8 -o "$TS_FILE".new "$TS_FILE" && mv "$TS_FILE".new "$TS_FILE"
fi fi
sed -i'' -e '/<location filename/d' $TS_FILE sed -i'' -e '/<location filename/d' $TS_FILE

6
ci/txpush.sh
View File

@ -82,10 +82,8 @@ $LUPDATE -no-obsolete $_srcdirs -ts lang/calamares_en.ts
# $LUPDATE -no-obsolete -extensions cxxtr src/libcalamares/locale -ts lang/tz_en.ts # $LUPDATE -no-obsolete -extensions cxxtr src/libcalamares/locale -ts lang/tz_en.ts
if test -n "$XMLLINT" ; then if test -n "$XMLLINT" ; then
for f in lang/calamares_en.ts TS_FILE="lang/calamares_en.ts"
do $XMLLINT --format --encode utf-8 -o "$TS_FILE".new "$TS_FILE" && mv "$TS_FILE".new "$TS_FILE"
$XMLLINT --format -o "$f".new "$f" && mv "$f".new "$f"
done
fi fi
tx push --source --no-interactive -r calamares.calamares-master tx push --source --no-interactive -r calamares.calamares-master