texlive[51569] trunk: doc,sync
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 6 22:42:52 CEST 2019
Revision: 51569
http://tug.org/svn/texlive?view=revision&revision=51569
Author: karl
Date: 2019-07-06 22:42:52 +0200 (Sat, 06 Jul 2019)
Log Message:
-----------
doc,sync
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu
trunk/Master/texmf-dist/scripts/texlive/NEWS
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-07-06 20:41:23 UTC (rev 51568)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2019-07-06 20:42:52 UTC (rev 51569)
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 51217 2019-05-24 21:47:41Z karl $
+# $Id: tlmgr.pl 51555 2019-07-04 22:23:27Z karl $
#
# Copyright 2008-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 51217 $';
-my $datrev = '$Date: 2019-05-24 23:47:41 +0200 (Fri, 24 May 2019) $';
+my $svnrev = '$Revision: 51555 $';
+my $datrev = '$Date: 2019-07-05 00:23:27 +0200 (Fri, 05 Jul 2019) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -2782,7 +2782,7 @@
next if ($pkg =~ m/^00texlive/);
for my $ep (@excluded_pkgs) {
if ($pkg eq $ep || $pkg =~ m/^$ep\./) {
- info("Skipping excluded package $pkg\n");
+ info("$prg: skipping excluded package: $pkg\n");
next TODO;
}
}
@@ -2805,7 +2805,7 @@
# $pkg, $flag, $lrev, $rrev, $size, $runtime, $esttot, $tag, $lcv, $rcv
machine_line("-ret", $pkg, $FLAG_FORCIBLE_REMOVED);
} else {
- info("skipping forcibly removed package $pkg\n");
+ info("$prg: skipping forcibly removed package: $pkg\n");
}
next;
} elsif ($newpkg_coll) {
@@ -3762,11 +3762,11 @@
my $tlp = $remotetlpdb->get_package($pkg);
my $rctanvers = $tlp->cataloguedata->{'version'};
if (!defined($tlp)) {
- info("Unknown package $pkg\n");
+ info("$prg: unknown package: $pkg\n");
next;
}
if (!$tlp->relocated && $opts{"usermode"}) {
- info("Package $pkg is not relocatable, cannot install it in user mode!\n");
+ info("$prg: package $pkg is not relocatable, cannot install it in user mode!\n");
next;
}
my $lctanvers;
@@ -4835,11 +4835,11 @@
my @todoarchs;
foreach my $a (@ARGV) {
if (TeXLive::TLUtils::member($a, @already_installed_arch)) {
- info("Platform $a is already installed\n");
+ info("$prg: platform already installed: $a\n");
next;
}
if (!TeXLive::TLUtils::member($a, @available_arch)) {
- info("Platform $a not available; see tlmgr platform list\n");
+ info("$prg: platform `$a' not available; see tlmgr platform list\n");
next;
}
push @todoarchs, $a;
@@ -4897,7 +4897,7 @@
next;
}
if ($currentarch eq $a) {
- info("You are running on platform $a, you cannot remove that one!\n");
+ info("$prg: You are running on platform $a, you cannot remove that one!\n");
$ret |= $F_WARNING;
next;
}
@@ -5238,7 +5238,7 @@
next unless -d "$Master/bin/$dirent";
if (-r "$Master/bin/$dirent/kpsewhich" || -r "$Master/bin/$dirent/kpsewhich.exe") {
push @archs, $dirent;
- debug("Skipping directory $Master/bin/$dirent, no kpsewhich there\n");
+ debug("$prg: skipping directory $Master/bin/$dirent, no kpsewhich there\n");
}
}
push @deps, "setting_available_architectures:" . join(" ", at archs);
@@ -6135,21 +6135,21 @@
. "from $fn\n");
$cf->delete_key($key);
} else {
- info("$arg $key not defined, cannot remove ($fn)\n");
+ info("$prg: $arg $key not defined, cannot remove ($fn)\n");
$ret = $F_WARNING;
}
} else {
if (defined($cf->value($key))) {
- info("$arg $key value: " . $cf->value($key) . " ($fn)\n");
+ info("$prg: $arg $key value: " . $cf->value($key) . " ($fn)\n");
} else {
- info("$key not defined in $arg config file ($fn)\n");
+ info("$prg: $key not defined in $arg config file ($fn)\n");
if ($arg eq "texmf") {
# not in user-specific file, show anything kpsewhich gives us.
chomp (my $defval = `kpsewhich -var-value $key`);
if ($? != 0) {
- info("$arg $key default value is unknown");
+ info("$prg: $arg $key default value is unknown");
} else {
- info("$arg $key default value: $defval");
+ info("$prg: $arg $key default value: $defval");
}
info(" (from kpsewhich -var-value)\n");
}
@@ -6160,7 +6160,7 @@
tlwarn("$arg --delete and value for key $key given, don't know what to do!\n");
$ret = $F_ERROR;
} else {
- info("setting $arg $key to $val (in $fn)\n");
+ info("$prg: setting $arg $key to $val (in $fn)\n");
$cf->value($key, $val);
}
}
@@ -6267,10 +6267,10 @@
my ($out, $ret) =
TeXLive::TLUtils::run_cmd("$::gpg --primary-keyring repository-keys.gpg --delete-key \"$what\" 2>&1");
if ($ret == 0) {
- info("key successfully removed\n");
+ info("$prg: key successfully removed\n");
return $F_OK;
} else {
- tlwarn("key removal failed, output:\n$out\n");
+ tlwarn("$prg: key removal failed, output:\n$out\n");
return $F_ERROR;
}
@@ -6277,7 +6277,7 @@
} elsif ($arg eq 'add') {
my $what = shift @ARGV;
if (!$what) {
- tlwarn("missing argument to `key add'\n");
+ tlwarn("$prg: missing argument to `key add'\n");
return $F_ERROR;
}
# we need to make sure that $local_keyring is existent!
@@ -6289,18 +6289,18 @@
my ($out, $ret) =
TeXLive::TLUtils::run_cmd("$::gpg --primary-keyring repository-keys.gpg --import \"$what\" 2>&1");
if ($ret == 0) {
- info("key successfully imported\n");
+ info("$prg: key successfully imported\n");
return $F_OK;
} else {
- tlwarn("key import failed, output:\n$out\n");
+ tlwarn("$prg: key import failed, output:\n$out\n");
return $F_ERROR;
}
} else {
- tldie("should not be reached: tlmgr key $arg\n");
+ tldie("$prg: should not be reached: tlmgr key $arg\n");
}
} else {
- tlwarn("unknown directive `$arg' to action `key'\n");
+ tlwarn("$prg: unknown directive `$arg' to action `key'\n");
return $F_ERROR;
}
return $F_OK;
@@ -9848,7 +9848,7 @@
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 51217 2019-05-24 21:47:41Z karl $
+$Id: tlmgr.pl 51555 2019-07-04 22:23:27Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
Modified: trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu
===================================================================
--- trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu 2019-07-06 20:41:23 UTC (rev 51568)
+++ trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu 2019-07-06 20:42:52 UTC (rev 51569)
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 50675 $", "%d+") or "0"
-local svndate = string.match("$Date: 2019-03-31 21:31:37 +0200 (Sun, 31 Mar 2019) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 51550 $", "%d+") or "0"
+local svndate = string.match("$Date: 2019-07-04 20:48:23 +0200 (Thu, 04 Jul 2019) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -285,8 +285,13 @@
local function show_error(msg)
if guimode then
+ local err_cmd
os.setenv('RUNSCRIPT_ERROR_MESSAGE', msg)
- if lfs.isfile(TEXDIR..'/tlpkg/tltcl/tclkit.exe') and
+ local errmess_path = TEXDIR .. '/texmf-dist/scripts/texlive/tl-errmess.vbs'
+ local err_cmd = {"wscript", errmess_path:gsub('/','\\')}
+ if lfs.isfile(errmess_path) then
+ os.spawn(err_cmd)
+ elseif lfs.isfile(TEXDIR..'/tlpkg/tltcl/tclkit.exe') and
lfs.isfile(TEXDIR..'/tlpkg/tltcl/gui_err.tcl') then
os.spawn{TEXDIR..'/tlpkg/tltcl/tclkit.exe',
TEXDIR..'/tlpkg/tltcl/gui_err.tcl'}
Modified: trunk/Master/texmf-dist/scripts/texlive/NEWS
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/NEWS 2019-07-06 20:41:23 UTC (rev 51568)
+++ trunk/Master/texmf-dist/scripts/texlive/NEWS 2019-07-06 20:42:52 UTC (rev 51569)
@@ -1,6 +1,10 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<p><b>tlmgr 51555 (released 5jul19):</b>
+<li>runscript.tlu: use vbscript for GUI error boxes, so tlshell can be
+its own self-contained package, entirely separate from texlive.infra.
+
<p><b>tlmgr 51217 (released 29may19):</b>
<li>propagate gpg verification status for GUIs.
More information about the tex-live-commits
mailing list