Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit cfab695d0e3bd5889cfa4b6e81300dd11d4eef72 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Mon Jul 19 17:32:06 2021 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Mon Jul 19 23:55:58 2021 +0200
Avoid bash'ism (comment in line continuation) bash appears to remove comments only up to the next line-continuation backslash/newline pair, while SUS mandates that the "<backslash> and <newline> shall be removed before splitting the input into tokens", and at least zsh 5.8 follows that interpretation and thus complained about a `then` not followed by a `fi` Change-Id: Ifedb002f133a7bc4f79bb9bec3e8c97ccc704aaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119227 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/Makefile.in b/Makefile.in index f9a2644e569a..a2b34f80088a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,9 +58,10 @@ else # MAKE_RESTARTS .DEFAULT_GOAL := build +# Nested test is to check if the systemd-detect-virt command doesn't exist or it reports we're not +# in a container: check-if-root: @if test ! `uname` = 'Haiku' -a `id -u` = 0; then \ - # if the systemd-detect-virt command doesn't exist or it reports we're not in a container \ if test ! -x "$$(command -v systemd-detect-virt)" || ! systemd-detect-virt -c -q; then \ echo; \ echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits