configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 37baabe6436037de604bfbc2702bfb0bc156c41b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Wed Mar 8 12:08:09 2017 +0100
Strip newlines from UCRT detecion using tr
Simply strip all newlines, returns and '\0' bytes using tr and
don't append a new newline when echo'ing the extracted value.
Change-Id: Id36293042c9071d5ef664a82ebd32de287574f31
Reviewed-on: https://gerrit.libreoffice.org/34970
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 20bf399..32013f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3311,9 +3311,9 @@ win_get_env_from_vsvars32bat()
echo -e "@echo %$1%\r\n" >> $WRAPPERBATCHFILEPATH
echo -e "@endlocal\r\n" >> $WRAPPERBATCHFILEPATH
chmod +x $WRAPPERBATCHFILEPATH
- _win_get_env_from_vsvars32bat="`$WRAPPERBATCHFILEPATH | $SED -e s/^M^J//`"
+ _win_get_env_from_vsvars32bat=$($WRAPPERBATCHFILEPATH | tr -d "\n\r\0")
rm -f $WRAPPERBATCHFILEPATH
- echo $_win_get_env_from_vsvars32bat
+ echo -n $_win_get_env_from_vsvars32bat
}
find_ucrt()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
