desktop/scripts/soffice.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4722bb82f8f2a181d882b8ad683ee5740da95cfa
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Mar 7 13:31:34 2017 +0100
desktop: unbreak soffice --valgrind
(regression from e6a9dc22a4e58b565894f8cdb6a19755af7b14de)
Change-Id: Ib394a64fb70a3b578d462c351eb9d68e9ac55d62
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index b73d6b3..5c76b6e 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -110,8 +110,8 @@ for arg in "$@" $EXTRAOPT ; do
test -z "$VALGRIND" && VALGRIND="memcheck"
# --trace-children-skip is pretty useful but supported only
with valgrind >= 3.6.0
valgrind_ver=$(valgrind --version | sed -e "s/valgrind-//")
- valgrind_ver_maj=$(echo "$valgrind_ver" | awk -F. '{ print \$1
}')
- valgrind_ver_min=$(echo "$valgrind_ver" | awk -F. '{ print \$2
}')
+ valgrind_ver_maj=$(echo "$valgrind_ver" | awk -F. '{ print $1
}')
+ valgrind_ver_min=$(echo "$valgrind_ver" | awk -F. '{ print $2
}')
valgrind_skip=
if [ "$valgrind_ver_maj" -gt 3 ] || ( [ "$valgrind_ver_maj"
-eq 3 ] && [ "$valgrind_ver_min" -ge 6 ] ) ; then
valgrind_skip='--trace-children-skip=*/java,*/gij'
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
