[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6645] colon for msys path separator
From: |
Gavin D. Smith |
Subject: |
[6645] colon for msys path separator |
Date: |
Thu, 24 Sep 2015 10:32:33 +0000 |
Revision: 6645
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6645
Author: gavin
Date: 2015-09-24 10:32:32 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
colon for msys path separator
Modified Paths:
--------------
trunk/ChangeLog
trunk/util/texi2dvi
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-09-24 10:17:45 UTC (rev 6644)
+++ trunk/ChangeLog 2015-09-24 10:32:32 UTC (rev 6645)
@@ -1,3 +1,10 @@
+2015-09-23 Vincent Belaïche <address@hidden>
+
+ * util/texi2dvi: Exempt msys as well as cygwin from using
+ semicolon as a path separator.
+ (list_concat_dirs, absolute_filenames): Replace a literal colon
+ with an expansion of a variable.
+
2015-09-23 Gavin Smith <address@hidden>
* util/texi2dvi (generated_files_get): Print a warning if the
Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2015-09-24 10:17:45 UTC (rev 6644)
+++ trunk/util/texi2dvi 2015-09-24 10:32:32 UTC (rev 6645)
@@ -86,15 +86,21 @@
: ${EGREP=egrep}
# Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin, where COMSPEC
+# 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" \
- && uname | $EGREP -iv 'cygwin' >/dev/null; then
+ && MSYSTEM=$OSTYPE uname | $EGREP -iv 'cygwin|msys' >/dev/null; then
path_sep=";"
else
path_sep=":"
fi
+
# Pacify verbose cds.
CDPATH=${ZSH_VERSION+.}$path_sep
@@ -391,7 +397,7 @@
# Hopefully no one will have an actual directory named EMPTY.
lcd_replace_EMPTY="-e 's/^$path_sep/EMPTY$path_sep/g' \
-e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
+ -e 's/$path_sep$path_sep/${path_sep}EMPTY${path_sep}/g'"
save_IFS=$IFS
IFS=$path_sep
set x `echo "$2" | eval $SED $lcd_replace_EMPTY`; shift
@@ -503,7 +509,7 @@
# Hopefully no one will have an actual directory named EMPTY.
af_replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
-e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
+ -e 's/$path_sep$path_sep/${path_sep}EMPTY${path_sep}/g'"
af_result=`echo "$1" | eval $SED $af_replace_empty`
save_IFS=$IFS
IFS=$path_sep
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6645] colon for msys path separator,
Gavin D. Smith <=