summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-06-27 21:32:19 +0000
committerKarl Berry <karl@freefriends.org>2011-06-27 21:32:19 +0000
commit9696647ded87f0eeda00239b2965d0c35f6e8f99 (patch)
treed6d44f855e396ab9ff07d9187fd3d3d221d4e521
parent448790feb905a717d1a74289fe5fb8ddff02cb58 (diff)
use versionfunc to placate Solaris sh
git-svn-id: svn://tug.org/texlive/trunk@23149 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/ChangeLog6
-rwxr-xr-xBuild/source/texk/tetex/fmtutil6
-rw-r--r--Build/source/texk/tetex/fmtutil.man2
3 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index b014d8b475b..0543e3f9ab9 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-27 Karl Berry <karl@tug.org>
+
+ * fmtutil (version): rename to versionfunc, or Solaris sh dies
+ with "bad substitution".
+ Report from Nelson, 23 Jun 2011 09:42:09.
+
2011-06-18 Karl Berry <karl@tug.org>
* updmap.pl (locateMap): allow "Map foo" (without the ".map"),
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index 72dbd981cc0..b11ef269f0c 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/fmtutil
@@ -142,7 +142,7 @@ eof
cleanup 0
}
-version()
+versionfunc()
{
cat <<eof
$progname version $version
@@ -433,7 +433,7 @@ main()
fullfmt=$1; shift
case $fullfmt in
""|--help) help ;;
- --version) version ;;
+ --version) versionfunc ;;
--*) abort "unknown option $fullfmt, try --help" ;;
*.fmt|*.mem|*.base)
set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
case "$cmd" in
"") abort "missing command; try $progname --help if you need it";;
help) help;;
- version) version;;
+ version) versionfunc;;
esac
if test -n "$cfgparam"; then
diff --git a/Build/source/texk/tetex/fmtutil.man b/Build/source/texk/tetex/fmtutil.man
index 952e35192cd..39ed57bf8b5 100644
--- a/Build/source/texk/tetex/fmtutil.man
+++ b/Build/source/texk/tetex/fmtutil.man
@@ -1,4 +1,4 @@
-.TH FMTUTIL 1 "July 2010" "TeX Live" "TeX Live"
+.TH FMTUTIL 1 "June 2011" "TeX Live" "TeX Live"
.SH "NAME"
fmtutil \- utility for maintaining TeX format files
.PP