Update tetex scripts (texconfig and texconfig-sys)

git-svn-id: svn://tug.org/texlive/trunk@22544 c570f23f-e606-0410-a88d-b1316a301751

36 files changed, 71 insertions, 233 deletions

diff --git a/Master/bin/alpha-linux/texconfig b/Master/bin/alpha-linux/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/alpha-linux/texconfig
+++ b/Master/bin/alpha-linux/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/alpha-linux/texconfig-sys b/Master/bin/alpha-linux/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/alpha-linux/texconfig-sys
+++ b/Master/bin/alpha-linux/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/amd64-freebsd/texconfig b/Master/bin/amd64-freebsd/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/amd64-freebsd/texconfig
+++ b/Master/bin/amd64-freebsd/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/amd64-freebsd/texconfig-sys b/Master/bin/amd64-freebsd/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/amd64-freebsd/texconfig-sys
+++ b/Master/bin/amd64-freebsd/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/amd64-kfreebsd/texconfig b/Master/bin/amd64-kfreebsd/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/amd64-kfreebsd/texconfig
+++ b/Master/bin/amd64-kfreebsd/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/amd64-kfreebsd/texconfig-sys b/Master/bin/amd64-kfreebsd/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/amd64-kfreebsd/texconfig-sys
+++ b/Master/bin/amd64-kfreebsd/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-cygwin/texconfig b/Master/bin/i386-cygwin/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/i386-cygwin/texconfig
+++ b/Master/bin/i386-cygwin/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/i386-cygwin/texconfig-sys b/Master/bin/i386-cygwin/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/i386-cygwin/texconfig-sys
+++ b/Master/bin/i386-cygwin/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-freebsd/texconfig b/Master/bin/i386-freebsd/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/i386-freebsd/texconfig
+++ b/Master/bin/i386-freebsd/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/i386-freebsd/texconfig-sys b/Master/bin/i386-freebsd/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/i386-freebsd/texconfig-sys
+++ b/Master/bin/i386-freebsd/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-kfreebsd/texconfig b/Master/bin/i386-kfreebsd/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/i386-kfreebsd/texconfig
+++ b/Master/bin/i386-kfreebsd/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/i386-kfreebsd/texconfig-sys b/Master/bin/i386-kfreebsd/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/i386-kfreebsd/texconfig-sys
+++ b/Master/bin/i386-kfreebsd/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/i386-linux/texconfig
+++ b/Master/bin/i386-linux/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/i386-linux/texconfig-sys b/Master/bin/i386-linux/texconfig-sys
index a67854789c4..dd58513a6ea 100755
--- a/Master/bin/i386-linux/texconfig-sys
+++ b/Master/bin/i386-linux/texconfig-sys
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-netbsd/texconfig b/Master/bin/i386-netbsd/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/i386-netbsd/texconfig
+++ b/Master/bin/i386-netbsd/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/i386-netbsd/texconfig-sys b/Master/bin/i386-netbsd/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/i386-netbsd/texconfig-sys
+++ b/Master/bin/i386-netbsd/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/i386-solaris/texconfig b/Master/bin/i386-solaris/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/i386-solaris/texconfig
+++ b/Master/bin/i386-solaris/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/i386-solaris/texconfig-sys b/Master/bin/i386-solaris/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/i386-solaris/texconfig-sys
+++ b/Master/bin/i386-solaris/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/mips-irix/texconfig b/Master/bin/mips-irix/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/mips-irix/texconfig
+++ b/Master/bin/mips-irix/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/mips-irix/texconfig-sys b/Master/bin/mips-irix/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/mips-irix/texconfig-sys
+++ b/Master/bin/mips-irix/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/powerpc-aix/texconfig b/Master/bin/powerpc-aix/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/powerpc-aix/texconfig
+++ b/Master/bin/powerpc-aix/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/powerpc-aix/texconfig-sys b/Master/bin/powerpc-aix/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/powerpc-aix/texconfig-sys
+++ b/Master/bin/powerpc-aix/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/powerpc-linux/texconfig b/Master/bin/powerpc-linux/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/powerpc-linux/texconfig
+++ b/Master/bin/powerpc-linux/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/powerpc-linux/texconfig-sys b/Master/bin/powerpc-linux/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/powerpc-linux/texconfig-sys
+++ b/Master/bin/powerpc-linux/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/sparc-linux/texconfig b/Master/bin/sparc-linux/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/sparc-linux/texconfig
+++ b/Master/bin/sparc-linux/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/sparc-linux/texconfig-sys b/Master/bin/sparc-linux/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/sparc-linux/texconfig-sys
+++ b/Master/bin/sparc-linux/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/sparc-solaris/texconfig b/Master/bin/sparc-solaris/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/sparc-solaris/texconfig
+++ b/Master/bin/sparc-solaris/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/sparc-solaris/texconfig-sys b/Master/bin/sparc-solaris/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/sparc-solaris/texconfig-sys
+++ b/Master/bin/sparc-solaris/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/universal-darwin/texconfig b/Master/bin/universal-darwin/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/universal-darwin/texconfig
+++ b/Master/bin/universal-darwin/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/universal-darwin/texconfig-sys b/Master/bin/universal-darwin/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/universal-darwin/texconfig-sys
+++ b/Master/bin/universal-darwin/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/x86_64-darwin/texconfig b/Master/bin/x86_64-darwin/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/x86_64-darwin/texconfig
+++ b/Master/bin/x86_64-darwin/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/x86_64-darwin/texconfig-sys b/Master/bin/x86_64-darwin/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/x86_64-darwin/texconfig-sys
+++ b/Master/bin/x86_64-darwin/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/x86_64-linux/texconfig b/Master/bin/x86_64-linux/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/x86_64-linux/texconfig
+++ b/Master/bin/x86_64-linux/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/x86_64-linux/texconfig-sys b/Master/bin/x86_64-linux/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/x86_64-linux/texconfig-sys
+++ b/Master/bin/x86_64-linux/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}
diff --git a/Master/bin/x86_64-solaris/texconfig b/Master/bin/x86_64-solaris/texconfig
index f37b30b1283..c9cc73c8305 100755
--- a/Master/bin/x86_64-solaris/texconfig
+++ b/Master/bin/x86_64-solaris/texconfig
@@ -1150,19 +1150,11 @@ $formatsForHyphenFmt"
       ;;
 
     init)
-      if test -n "$texconfig_sys"; then  # set by texconfig-sys
-        fmtutil=fmtutil-sys
-        updmap=updmap-sys
-      else
-        fmtutil=fmtutil
-        updmap=updmap
-      fi
-      
       case $2 in
         "")
-          if $fmtutil --all \
+          if fmtutil --all \
              && texlinks --multiplatform \
-             && $updmap; then
+             && updmap; then
             :
           else
             rc=1
@@ -1171,7 +1163,7 @@ $formatsForHyphenFmt"
         *)
           shift 1
           for i in "$@"; do
-            $fmtutil --byfmt "$i" || rc=1
+            fmtutil --byfmt "$i" || rc=1
           done
           ;;
       esac
diff --git a/Master/bin/x86_64-solaris/texconfig-sys b/Master/bin/x86_64-solaris/texconfig-sys
index 8a88750098c..ff549003ad2 100755
--- a/Master/bin/x86_64-solaris/texconfig-sys
+++ b/Master/bin/x86_64-solaris/texconfig-sys
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig-sys 5067 2007-09-30 18:06:26Z karl $
+# $Id: texconfig-sys 20962 2011-01-07 11:45:38Z peter $
 
 # texconfig-sys: Thomas Esser, public domain.
 
@@ -26,7 +26,6 @@ c=`kpsewhich -var-value TEXMFSYSCONFIG`
 
 TEXMFVAR="$v"
 TEXMFCONFIG="$c"
-texconfig_sys=1
 export TEXMFVAR TEXMFCONFIG
 
 exec texconfig ${1+"$@"}