summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl5
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl24
-rw-r--r--Master/texmf-dist/doc/fonts/jfmutil/README-ja.md3
-rw-r--r--Master/texmf-dist/doc/fonts/jfmutil/README.md3
-rwxr-xr-xMaster/texmf-dist/scripts/jfmutil/jfmutil.pl5
5 files changed, 30 insertions, 10 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl b/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
index f7fd5c49247..7699dbcf120 100755
--- a/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
#
# This is file 'jfmutil.pl'.
#
@@ -2769,8 +2770,8 @@ package main;
#================================================= BEGIN
use Encode qw(encode decode);
my $prog_name = 'jfmutil';
-my $version = '1.0.0';
-my $mod_date = '2017/07/17';
+my $version = '1.0.1';
+my $mod_date = '2017/07/21';
#use Data::Dump 'dump';
#
my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc);
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 4fad43ea7a6..7b63fbd6794 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 44452 2017-06-04 23:45:39Z karl $
+# $Id: tlmgr.pl 44836 2017-07-17 23:59:48Z preining $
#
# Copyright 2008-2017 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 44452 $';
-my $datrev = '$Date: 2017-06-05 01:45:39 +0200 (Mon, 05 Jun 2017) $';
+my $svnrev = '$Revision: 44836 $';
+my $datrev = '$Date: 2017-07-18 01:59:48 +0200 (Tue, 18 Jul 2017) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -6262,7 +6262,7 @@ END_NO_CHECKSUMS
$remotetlpdb->make_virtual;
my $locstr = $repos{'main'};
- my ($tlmdb, $errormsg) = setup_one_remotetlpdb($locstr);
+ my ($tlmdb, $errormsg) = setup_one_remotetlpdb($locstr, 'main');
if (!defined($tlmdb)) {
return (0, $errormsg);
}
@@ -6336,7 +6336,7 @@ sub _init_tlmedia {
}
my $errormsg;
- ($remotetlpdb, $errormsg) = setup_one_remotetlpdb($location);
+ ($remotetlpdb, $errormsg) = setup_one_remotetlpdb($location, 'main');
if (!defined($remotetlpdb)) {
return(0, $errormsg);
}
@@ -6359,6 +6359,8 @@ sub _init_tlmedia {
sub setup_one_remotetlpdb {
my $location = shift;
+ my $addarg = shift;
+ my $is_main = ((defined($addarg) && ($addarg eq 'main')) ? 1 : 0);
my $remotetlpdb;
# TODO
@@ -6494,6 +6496,16 @@ $rroot
do not include the version of the local installation
($TeXLive::TLConfig::ReleaseYear).");
}
+ #
+ # if the release of the installed TL is less than the release
+ # of the main remote repository, then
+ # warn that one needs to call update-tlmgr-latest.sh --update
+ if ($is_main && $TeXLive::TLConfig::ReleaseYear < $texlive_release_year) {
+ return (undef, "Remote repository is newer than local ($TeXLive::TLConfig::ReleaseYear < $texlive_release_year)\n"
+ . "Cross release updates are only supported with\n"
+ . " update-tlmgr-latest(.sh/.exe) --update\n"
+ . "Please see https://tug.org/texlive/upgrade.html for details.")
+ }
} else {
# $texlive_minrelease not defined, so only one year is valid
if ($texlive_release_year != $TeXLive::TLConfig::ReleaseYear) {
@@ -8887,7 +8899,7 @@ This script and its documentation were written for the TeX Live
distribution (L<http://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 44452 2017-06-04 23:45:39Z karl $
+$Id: tlmgr.pl 44836 2017-07-17 23:59:48Z preining $
=cut
# to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
index 0d05f3568ea..f95e740d60d 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
+++ b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
@@ -392,6 +392,9 @@ MIT ライセンス
更新履歴
--------
+ * Version 1.0.1 〈2017/07/21〉
+ - shebang 行を追加。
+
* Version 1.0.0 〈2017/07/17〉
- (jfmutil として)最初の公開版。
- ZRTeXtor は v1.4.0 相当。
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README.md b/Master/texmf-dist/doc/fonts/jfmutil/README.md
index a4594fe7c2c..8b2c26db592 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README.md
+++ b/Master/texmf-dist/doc/fonts/jfmutil/README.md
@@ -51,6 +51,9 @@ Please refer to README-ja.md (in Japanese) for detail.
Revision History
----------------
+ * Version 1.0.1 〈2017/07/21〉
+ - Add shebang line.
+
* Version 1.0.0 〈2017/07/17〉
- The first public version (as jfmutil).
- ZRTeXtor is of v1.4.0.
diff --git a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
index f7fd5c49247..7699dbcf120 100755
--- a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
+++ b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
#
# This is file 'jfmutil.pl'.
#
@@ -2769,8 +2770,8 @@ package main;
#================================================= BEGIN
use Encode qw(encode decode);
my $prog_name = 'jfmutil';
-my $version = '1.0.0';
-my $mod_date = '2017/07/17';
+my $version = '1.0.1';
+my $mod_date = '2017/07/21';
#use Data::Dump 'dump';
#
my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc);