8176033: New cygwin grep does not match \r as newline

Sat, 07 Apr 2018 03:28:39 -0700

author
kevinw
date
Sat, 07 Apr 2018 03:28:39 -0700
changeset 2210
a05ed58d5ae0
parent 2209
cddffb220808
child 2211
2209644bcac4

8176033: New cygwin grep does not match \r as newline
Reviewed-by: erikj, tbell, ihse

common/autoconf/basics_windows.m4 file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/basics_windows.m4	Fri Apr 06 04:20:26 2018 -0700
     1.2 +++ b/common/autoconf/basics_windows.m4	Sat Apr 07 03:28:39 2018 -0700
     1.3 @@ -321,8 +321,8 @@
     1.4        AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
     1.5      fi
     1.6      AC_MSG_CHECKING([cygwin root directory as unix-style path])
     1.7 -    # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
     1.8 -    cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
     1.9 +    # The cmd output ends with Windows line endings (CR/LF)
    1.10 +    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
    1.11      # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
    1.12      CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
    1.13      AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
     2.1 --- a/common/autoconf/generated-configure.sh	Fri Apr 06 04:20:26 2018 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Sat Apr 07 03:28:39 2018 -0700
     2.3 @@ -4219,7 +4219,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1523013611
     2.8 +DATE_WHEN_GENERATED=1523096909
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -13930,8 +13930,8 @@
    2.13      fi
    2.14      { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5
    2.15  $as_echo_n "checking cygwin root directory as unix-style path... " >&6; }
    2.16 -    # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
    2.17 -    cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
    2.18 +    # The cmd output ends with Windows line endings (CR/LF)
    2.19 +    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
    2.20      # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
    2.21      CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
    2.22      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_ROOT_PATH" >&5

mercurial