summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-09 23:09:26 +0000
committerKarl Berry <karl@freefriends.org>2012-04-09 23:09:26 +0000
commit494fe58285d81e1b7055df4c4d3eeae503d5fbf6 (patch)
tree48770594d02f682136bed83083f2e950a1ce7170 /Build/source
parent2d05113a7a102fb5589b6d25c3ad74657443c1d1 (diff)
avoid double slashes in tmpdir
git-svn-id: svn://tug.org/texlive/trunk@25899 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rwxr-xr-xBuild/source/texk/tetex/fmtutil3
2 files changed, 7 insertions, 1 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 525975b1794..2c99c5c7b48 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-10 Karl Berry <karl@tug.org>
+
+ * fmtutil (main): eradicate double slashes in tmpdir.
+ tex-k mail from Alexey Vikhlinin, 8 Apr 2012 17:32:02.
+
2012-03-12 Karl Berry <karl@tug.org>
* updmap.cfg.5: avoid ... at beginning of line.
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index b11ef269f0c..b9f97aa8998 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/fmtutil
@@ -419,9 +419,10 @@ main()
need_find_hyphenfile=false
cfgparam=
cfgmaint=
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
verboseFlag=true
noAbortFlag=false
+ # eradicate double slashes to avoid kpathsea expansion.
+ tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
# first generated filename after successful generation to stdout then