CustomTarget_html.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8339ecf401eb80f1d501d9d5d9e6de10908773cd
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Fri Feb 15 14:18:37 2019 +0100
tdf#121532 Don't use non-standard `echo -n`
At least the version of echo used to build TDF's LO 6.2.0.3 release
apparently
doesn't understand that non-standard option and printed out "-n" verbatim,
generating a broken languages.js. (Though my local macOS 10.14.3 /bin/echo
does
understand that option.)
Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1
Reviewed-on: https://gerrit.libreoffice.org/67858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7)
Reviewed-on: https://gerrit.libreoffice.org/67860
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 7c5a9ddc8..b3c9b4e69 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -52,9 +52,9 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
$(SRCDIR)/helpcontent2/CustomTarget_html.mk
( \
- echo -n 'var languagesSet = new Set([' ; \
- for lang in $(gb_HELP_LANGS) ; do echo -n "'$$lang', " ; done |
sed 's/, $$//' ; \
- echo ']);' \
+ printf 'var languagesSet = new Set([' ; \
+ for lang in $(gb_HELP_LANGS) ; do printf '%s' "'$$lang', " ;
done | sed 's/, $$//' ; \
+ printf ']);\n' \
) > $@
define html_gen_langnames_js_dep
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
