diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-03-08 12:08:09 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-03-08 16:23:15 +0000 |
commit | 37baabe6436037de604bfbc2702bfb0bc156c41b (patch) | |
tree | 7628e62f96a096db5bf5d2aec0956f59860ddaa7 /configure.ac | |
parent | 8800292351dcf1f538c47ac6acf834ac2633ce6b (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 20bf399b752c..32013f34aae5 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() |