ltxfileinfo (16oct15)

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

6 files changed, 55 insertions, 99 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo b/Build/source/texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo
index b9c5fc30347..9b74dd95a8d 100755
--- a/Build/source/texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo
+++ b/Build/source/texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=2.03
+version=2.04
 myname=$(basename "$0")
 
 <<'DOC'
@@ -49,12 +49,11 @@ ltxfileinfo tries to detect (and report) mal-formatted dates and versions;
 use the |--star| option to mark such fields with a star, of use the |--color|
 option to color invalid fields red, if you work in a terminal with ANSI-coloring
 capabilities.
-These options are useful for developers
-who want to check the correctness of their |\Provides...| statements.
-For example:
+These options are useful for developers who want to check the correctness
+of their |\Provides...| statements. For example:
 
   $ ltxfileinfo -s arfonts.sty
-  file: arfonts.sty (ARfonts.sty*)
+  file: ARfonts.sty* (case difference in \Provides statement)
   date: 2006/01/01
   vers: --*
   info: Part of the Arabi package
@@ -139,7 +138,7 @@ function trim {
    echo -n "$var"
 }
 
-# mark a string by appending a * (--mark star)
+# mark a string by appending a * (--star and --color options)
 function mark {
    echo "$mark1${*}$mark2"
 }
@@ -204,16 +203,25 @@ function extract {
 # display the results
 function display {
    # file should be equal to arg (the argument)
-   [[ $file != "$arg" ]] && file="$arg ($(mark "$file"))"
+   if [[ $file != "$arg" ]] && [[ -n $mark2 ]]; then 
+      file="$(mark "$file") (case difference in \\Provides statement)"
+   fi
    
    # to be correct, date must be of the form yyyy/mm/dd
-   if [[ ! $date =~ ^[[:digit:]]{4}/[[:digit:]]{2}/[[:digit:]]{2}$ ]]; then
-      date=$(mark $date)
-   else
-      # also, the number must be valid:
-      if [ "$( date -d "$date" +%arg 2>&1 | grep invalid )" != "" ] ; then
-         date=$(mark "$date")
+   if [[ $date == -- ]]; then
+      date="$(mark $date)  (file modification date: $(stat -c %z "$loca"|sed -e 's/\..*//'))"
+   elif [[ -n $mark2 ]]; then
+      local wrong=false add=''
+      if [[ ! $date =~ ^[[:digit:]]{4}/[[:digit:]]{2}/[[:digit:]]{2}$ ]]; then
+         add+="  (wrong format)"
+         wrong=true
+      fi
+      if [ "$(date -d "$date" +%arg 2>&1 | grep invalid)" != "" ]; then
+         # even if it matches, the date must be valid:
+         add+="  (invalid date)"
+         wrong=true
       fi
+      if $wrong; then date="$(mark "$date")$add"; fi
    fi
    
    # version should be 1.2 or 1.2.3, maybe prefixed with v and suffixed with zero or more lower case letters
@@ -319,7 +327,7 @@ cp "$loca" "$dir"
 cd "$dir" || die "Could not cd to $dir"
 
 # The following code is mostly from Uwe Lueck's readprov.sty:
-echo '
+printf %s '
 \makeatletter
 \def\GetFileInfo#1{%
   \def\filename{#1}%
@@ -411,34 +419,3 @@ fi
 out=($out)
 extract "${out[@]}"
 display
-exit 0
-
-# template for README file:
-<<'README'
-This is release %version% of the ltxfileinfo script
-License: GPL
-
-Short description:
-ltxfileinfo is a bash script; it prints information about a latex class,
-style and other files to standard output.
-The script is based on Uwe Lueck's readprov.sty, so it prints information
-only for files that contain a \ProvidesFile, \ProvidesClass or
-\ProvidesPackage statement.
-The script tries to correct errors in these \Provides... statements and it
-has options, useful for developers, to make errors in those statements visible.
-
-Usage example:
-
-$ ltxfileinfo article.cls
-name: article.cls
-date: 2007/10/19
-vers: v1.4h
-info: Standard LaTeX document class
-loca: /usr/local/texlive/2009/texmf-dist/tex/latex/base/article.cls
-
-major changes of release %version% relative to 1.1
-- completely rewritten as a bash script, using code from readprov.sty
-- now also can evaluate xelatex oriented files
-- can now handle any LaTeX file containing a \Provides... statement
-- options for \Provides... statement validation
-README
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index f3b09ceab7b..ff2463fc8d9 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 37583 2015-06-17 05:51:36Z preining $
+# $Id: fmtutil.pl 38582 2015-10-07 22:32:58Z karl $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -25,11 +25,11 @@ BEGIN {
 }
 
 
-my $svnid = '$Id: fmtutil.pl 37583 2015-06-17 05:51:36Z preining $';
-my $lastchdate = '$Date: 2015-06-17 07:51:36 +0200 (Wed, 17 Jun 2015) $';
+my $svnid = '$Id: fmtutil.pl 38582 2015-10-07 22:32:58Z karl $';
+my $lastchdate = '$Date: 2015-10-08 00:32:58 +0200 (Thu, 08 Oct 2015) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 37583 $';
+my $svnrev = '$Revision: 38582 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 80539d38d28..bc9e33cc78d 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 38566 2015-10-06 02:49:58Z preining $
+# $Id: tlmgr.pl 38618 2015-10-12 02:51:38Z preining $
 #
 # Copyright 2008-2015 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
 
-my $svnrev = '$Revision: 38566 $';
-my $datrev = '$Date: 2015-10-06 04:49:58 +0200 (Tue, 06 Oct 2015) $';
+my $svnrev = '$Revision: 38618 $';
+my $datrev = '$Date: 2015-10-12 04:51:38 +0200 (Mon, 12 Oct 2015) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -3023,7 +3023,9 @@ sub action_update {
       # - then it is tried to be updated here, which is not working!
       # report that and ask for report
       if (!defined($tlp)) {
-        tlwarn("$prg: inconsistency on the server:\n");
+        my %servers = repository_to_array($location);
+        my $servers = join("\n ", values(%servers));
+        tlwarn("$prg: inconsistency on (one of) the server(s): $servers\n");
         tlwarn("$prg: tlp for package $pkg cannot be found, please report.\n");
         $ret |= $F_WARNING;
         next;
diff --git a/Master/texmf-dist/doc/support/ltxfileinfo/README b/Master/texmf-dist/doc/support/ltxfileinfo/README
index 8bf898528db..099252929f5 100644
--- a/Master/texmf-dist/doc/support/ltxfileinfo/README
+++ b/Master/texmf-dist/doc/support/ltxfileinfo/README
@@ -4,7 +4,7 @@
    type:| bash
  author:| Wybo Dekker
   email:| wybo@dekkerdocumenten.nl
-version:| 2.03
+version:| 2.04
 license:| Released under the GNU General Public License
 
 ltxfileinfo displays version information for LaTeX files. If no path
diff --git a/Master/texmf-dist/doc/support/ltxfileinfo/ltxfileinfo.pdf b/Master/texmf-dist/doc/support/ltxfileinfo/ltxfileinfo.pdf
index 52837e52ae5..42291094fcd 100644
--- a/Master/texmf-dist/doc/support/ltxfileinfo/ltxfileinfo.pdf
+++ b/Master/texmf-dist/doc/support/ltxfileinfo/ltxfileinfo.pdf
diff --git a/Master/texmf-dist/scripts/ltxfileinfo/ltxfileinfo b/Master/texmf-dist/scripts/ltxfileinfo/ltxfileinfo
index b9c5fc30347..9b74dd95a8d 100755
--- a/Master/texmf-dist/scripts/ltxfileinfo/ltxfileinfo
+++ b/Master/texmf-dist/scripts/ltxfileinfo/ltxfileinfo
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=2.03
+version=2.04
 myname=$(basename "$0")
 
 <<'DOC'
@@ -49,12 +49,11 @@ ltxfileinfo tries to detect (and report) mal-formatted dates and versions;
 use the |--star| option to mark such fields with a star, of use the |--color|
 option to color invalid fields red, if you work in a terminal with ANSI-coloring
 capabilities.
-These options are useful for developers
-who want to check the correctness of their |\Provides...| statements.
-For example:
+These options are useful for developers who want to check the correctness
+of their |\Provides...| statements. For example:
 
   $ ltxfileinfo -s arfonts.sty
-  file: arfonts.sty (ARfonts.sty*)
+  file: ARfonts.sty* (case difference in \Provides statement)
   date: 2006/01/01
   vers: --*
   info: Part of the Arabi package
@@ -139,7 +138,7 @@ function trim {
    echo -n "$var"
 }
 
-# mark a string by appending a * (--mark star)
+# mark a string by appending a * (--star and --color options)
 function mark {
    echo "$mark1${*}$mark2"
 }
@@ -204,16 +203,25 @@ function extract {
 # display the results
 function display {
    # file should be equal to arg (the argument)
-   [[ $file != "$arg" ]] && file="$arg ($(mark "$file"))"
+   if [[ $file != "$arg" ]] && [[ -n $mark2 ]]; then 
+      file="$(mark "$file") (case difference in \\Provides statement)"
+   fi
    
    # to be correct, date must be of the form yyyy/mm/dd
-   if [[ ! $date =~ ^[[:digit:]]{4}/[[:digit:]]{2}/[[:digit:]]{2}$ ]]; then
-      date=$(mark $date)
-   else
-      # also, the number must be valid:
-      if [ "$( date -d "$date" +%arg 2>&1 | grep invalid )" != "" ] ; then
-         date=$(mark "$date")
+   if [[ $date == -- ]]; then
+      date="$(mark $date)  (file modification date: $(stat -c %z "$loca"|sed -e 's/\..*//'))"
+   elif [[ -n $mark2 ]]; then
+      local wrong=false add=''
+      if [[ ! $date =~ ^[[:digit:]]{4}/[[:digit:]]{2}/[[:digit:]]{2}$ ]]; then
+         add+="  (wrong format)"
+         wrong=true
+      fi
+      if [ "$(date -d "$date" +%arg 2>&1 | grep invalid)" != "" ]; then
+         # even if it matches, the date must be valid:
+         add+="  (invalid date)"
+         wrong=true
       fi
+      if $wrong; then date="$(mark "$date")$add"; fi
    fi
    
    # version should be 1.2 or 1.2.3, maybe prefixed with v and suffixed with zero or more lower case letters
@@ -319,7 +327,7 @@ cp "$loca" "$dir"
 cd "$dir" || die "Could not cd to $dir"
 
 # The following code is mostly from Uwe Lueck's readprov.sty:
-echo '
+printf %s '
 \makeatletter
 \def\GetFileInfo#1{%
   \def\filename{#1}%
@@ -411,34 +419,3 @@ fi
 out=($out)
 extract "${out[@]}"
 display
-exit 0
-
-# template for README file:
-<<'README'
-This is release %version% of the ltxfileinfo script
-License: GPL
-
-Short description:
-ltxfileinfo is a bash script; it prints information about a latex class,
-style and other files to standard output.
-The script is based on Uwe Lueck's readprov.sty, so it prints information
-only for files that contain a \ProvidesFile, \ProvidesClass or
-\ProvidesPackage statement.
-The script tries to correct errors in these \Provides... statements and it
-has options, useful for developers, to make errors in those statements visible.
-
-Usage example:
-
-$ ltxfileinfo article.cls
-name: article.cls
-date: 2007/10/19
-vers: v1.4h
-info: Standard LaTeX document class
-loca: /usr/local/texlive/2009/texmf-dist/tex/latex/base/article.cls
-
-major changes of release %version% relative to 1.1
-- completely rewritten as a bash script, using code from readprov.sty
-- now also can evaluate xelatex oriented files
-- can now handle any LaTeX file containing a \Provides... statement
-- options for \Provides... statement validation
-README