[Libreoffice-commits] core.git: configure.ac

[Jan-Marek Glogowski]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 019ea173701eae4b8c5ffd45bb0063fc0a688ce0
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Mar 9 17:11:28 2017 +0100

    Just get rid of CR when parsing .bat output
    
    Converts Windows to Unix newlines, so bash will handle the
    result correctly.
    
    Since $(..) or `..` will already remove trailing newlines,
    this reverts the unneeded changes of commit
    37baabe6436037de604bfbc2702bfb0bc156c41b
    
    Change-Id: I0071237f0600c2d71da066eb2e2b541e338e7016

diff --git a/configure.ac b/configure.ac
index dc837c5..c970c39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3313,9 +3313,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 | tr -d "\n\r\0")
+    _win_get_env_from_vsvars32bat=$($WRAPPERBATCHFILEPATH | tr -d "\r")
     rm -f $WRAPPERBATCHFILEPATH
-    echo -n $_win_get_env_from_vsvars32bat
+    echo $_win_get_env_from_vsvars32bat
 }
 
 find_ucrt()