sync

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

2 files changed, 12 insertions, 8 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index 5eb985459aa..81e6e9132df 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: updmap.pl 31440 2013-08-15 22:39:10Z karl $
+# $Id: updmap.pl 31772 2013-09-25 23:17:02Z karl $
 # updmap - maintain map files for outline fonts.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -34,7 +34,7 @@ BEGIN {
 }
 
 
-my $version = '$Id: updmap.pl 31440 2013-08-15 22:39:10Z karl $';
+my $version = '$Id: updmap.pl 31772 2013-09-25 23:17:02Z karl $';
 
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
@@ -380,9 +380,8 @@ sub main {
         exit 0;
       }
       $changed ||= enable_disable_maps(@missing);
-      print "finished.\n";
-      # the original script did not run any update of the map files here,
-      # should we do that?
+      print "$0 --syncwithtrees finished.\n";
+      print "Now you need to run $prg normally to recreate map files.\n"
     }
     exit 0;
   }
@@ -2299,6 +2298,11 @@ Explanation of trees and files normally used:
       
     2) If neither of the above two are present and changes are made, a
     new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg.
+  
+  In general, the idea is that if a given config file is not writable, a
+  higher-level one can be used.  That way, the distribution's settings
+  can be overridden for system-wide using TEXMFLOCAL, and then system
+  settings can be overridden again for a particular using using TEXMFHOME.
 
   Resolving multiple definitions of a font:
     If a font is defined in more than one map file, then the definition
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index da4f40cb93a..8dfeaaf75de 100755
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
 

 

-local svnrevision = string.match("$Revision: 31727 $", "%d+") or "0"

-local svndate     = string.match("$Date: 2013-09-22 14:17:04 +0900 (Sun, 22 Sep 2013) $", "[-%d]+") or "2009-12-04"

+local svnrevision = string.match("$Revision: 31764 $", "%d+") or "0"

+local svndate     = string.match("$Date: 2013-09-26 01:02:54 +0200 (Thu, 26 Sep 2013) $", "[-%d]+") or "2009-12-04"

 local bannerstr   = "runscript wrapper utility (rev. " ..

                     svnrevision .. ", " .. svndate .. ")\n" .. 

                     "usage:   runscript script-name [arguments]\n" ..

@@ -510,7 +510,7 @@ if GSEXE then
 else

   -- use built in gs

   os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts;'

-    ..os.getenv('WINDIR')..'/Fonts'..TEXMFDIST..'/fonts')

+    ..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts')

   os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')

   GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'

   GSNAME = 'gswin32c.exe'