branch master updated: Msys2 OS detection in texi2dvi

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new df780e22a5 Msys2 OS detection in texi2dvi
df780e22a5 is described below

commit df780e22a5898df4a0f52ceb0ae3579ea7c78646
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Apr 8 17:27:00 2022 +0100

    Msys2 OS detection in texi2dvi
    
    * util/texi2dvi: Do not set MSYSTEM via OSTYPE environment
    variable before calling uname, as this is not working on
    Msys2.  Reverses change on 2015-09-23.  Instead, check the value of
    OSTYPE directly as well as calling uname.
    
    Report and testing by Tomas Kalibera <tomas.kalibera@gmail.com>.
---
 ChangeLog     | 11 +++++++++++
 util/texi2dvi | 11 ++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb20920eee..4c7506aaaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-04-08  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Msys2 OS detection in texi2dvi
+
+       * util/texi2dvi: Do not set MSYSTEM via OSTYPE environment
+       variable before calling uname, as this is not working on
+       Msys2.  Reverses change on 2015-09-23.  Instead, check the value of
+       OSTYPE directly as well as calling uname.
+
+       Report and testing by Tomas Kalibera <tomas.kalibera@gmail.com>.
+
 2022-04-08  Gavin Smith  <gavinsmith0123@gmail.com>
 
        Fix MathJax referencing in docs build.
diff --git a/util/texi2dvi b/util/texi2dvi
index 1f42b41907..84ddde517c 100755
--- a/util/texi2dvi
+++ b/util/texi2dvi
@@ -80,12 +80,9 @@ IFS="$space$tab$newline"
 # directories in TEXINPUTS -- except for Cygwin and Msys, where COMSPEC
 # might be inherited, but : is used.
 
-# In the case of Msys, uname returns a value derived from MSYSTEM, as
-# MSYSTEM is user configurable, it is not so safe to use it to detect
-# Msys. It is safer to use OSTYPE, this is why we set MSYSTEM to
-# $OSTYPE before calling uname
 if test -n "$COMSPEC$ComSpec" \
-   && MSYSTEM=$OSTYPE uname | $EGREP -iv 'cygwin|msys' >/dev/null; then
+   && uname | $EGREP -iv 'cygwin|msys' >/dev/null \
+   && test "$OSTYPE" != msys ; then
   path_sep=";"
 else
   path_sep=":"
@@ -198,9 +195,9 @@ EOF
 version ()
 {
   cat <<EOF
-texi2dvi (GNU Texinfo 6.8)
+texi2dvi (GNU Texinfo 6.8dev)
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2022 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.