lwarp (3apr19)

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

3 files changed, 18 insertions, 23 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
index faf9813e21b..39c4a9e0bf5 100755
--- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
+++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2018 Brian Dunn
 
-printversion = "v0.69"
+printversion = "v0.70"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -388,7 +388,7 @@ function warnlimages ()
     print ("lwarpmk: \"" .. sourcename .. "-images.txt\" does not exist.")
     print ("lwarpmk: Your project does not use SVG math or other lateximages,")
     print ("lwarpmk: or the file has been deleted somehow.")
-    print ("lwarpmk: Use \"lwarpmk html\" to recompile your project")
+    print ("lwarpmk: Use \"lwarpmk html1\" to recompile your project")
     print ("lwarpmk: and recreate \"" .. sourcename .. "-images.txt\".")
     print ("lwarpmk: If your project does not use SVG math or other lateximages,")
     print ("lwarpmk: then \"" .. sourcename .. "-images.txt\" will never exist, and")
@@ -400,8 +400,9 @@ function warnlimagesrecompile ()
 -- Warning if must recompile before creating limages:
     print ("")
     print ("lwarpmk: ===")
+    print ("lwarpmk: Cross-references are not yet correct.")
     print ("lwarpmk: The document must be recompiled before creating the lateximages.")
-    print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
+    print ("lwarpmk: Enter \"lwarpmk html1\" again, then try \"lwarpmk limages\" again.")
     print ("lwarpmk: ===")
 end --warnlimagesrecompile
 
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index aae8165c6d3..27e210b45ad 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 50333 2019-03-11 01:55:52Z preining $
+# $Id: tlmgr.pl 50692 2019-04-01 15:01:10Z preining $
 #
 # Copyright 2008-2019 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 50333 $';
-my $datrev = '$Date: 2019-03-11 02:55:52 +0100 (Mon, 11 Mar 2019) $';
+my $svnrev = '$Revision: 50692 $';
+my $datrev = '$Date: 2019-04-01 17:01:10 +0200 (Mon, 01 Apr 2019) $';
 my $tlmgrrevision;
 my $tlmgrversion;
 my $prg;
@@ -6906,6 +6906,12 @@ END_NO_INTERNET
         # TODO should we die here? Probably yes because one of 
         # checksum file or signature file has changed!
         tldie("$prg: verification of checksum for $location failed: $msg\n");
+      } elsif ($ret == $VS_EXPKEYSIG) {
+        # do nothing, try to get new tlpdb and hope sig is better?
+        debug("$prg: good signature bug gpg key expired, continuing anyway!\n");
+      } elsif ($ret == $VS_REVKEYSIG) {
+        # do nothing, try to get new tlpdb and hope sig is better?
+        debug("$prg: good signature but from revoked gpg key, continuing anyway!\n");
       } elsif ($ret == $VS_VERIFIED) {
         $remotetlpdb = TeXLive::TLPDB->new(root => $location,
           tlpdbfile => $loc_copy_of_remote_tlpdb);
@@ -9763,7 +9769,7 @@ This script and its documentation were written for the TeX Live
 distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 50333 2019-03-11 01:55:52Z preining $
+$Id: tlmgr.pl 50692 2019-04-01 15:01:10Z preining $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
index c3b9d44cfbf..e0f2497c422 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -11,7 +11,7 @@ package require Tk
 catch {rename send {}}
 
 # unix: make sure TL comes first on process searchpath
-# on windows, runscript takes care of this.
+# on windows, a wrapper takes care of this.
 if {$::tcl_platform(platform) ne "windows"} {
   set texbin [file dirname [file normalize [info script]]]
   set savedir [pwd]
@@ -27,18 +27,6 @@ if {$::tcl_platform(platform) ne "windows"} {
   unset texbin
   unset savedir
   unset dirs
-} else {
-  # until we have a better wrapper, just hardcode stuff
-  set texbin [file dirname [file normalize [info script]]]
-  set texbin "$texbin\\..\\..\\..\\bin\\win32"
-  set texbin [file normalize $texbin]
-  set texbin [string map {/ \\} $texbin]
-  set dirs [split $::env(PATH) ";"]
-  if {[lindex $dirs 0] ne $texbin} {
-    set ::env(PATH) "${texbin};$::env(PATH)"
-  }
-  unset texbin
-  unset dirs
 }
 
 # declarations and utilities shared with install-tl-gui.tcl
@@ -49,9 +37,9 @@ source [file join $::instroot "tlpkg" "tltcl" "tltcl.tcl"]
 set ::our_platform [exec -ignorestderr tlmgr print-platform]
 
 # searchpath and locale:
-# windows: most scripts run via [w]runscript, which adjusts the searchpath
+# windows: tlshell runs via a wrapper which adjusts the searchpath
 # for the current process.
-# tlshell.tcl should  be run via a symlink in a directory
+# others: tlshell.tcl should  be run via a symlink in a directory
 # which also contains (a symlink to) kpsewhich.
 # This directory will be prepended to the searchpath.
 # kpsewhich should disentangle symlinks.
@@ -1530,7 +1518,7 @@ proc update_self_q {} {
       [string cat [__ "If update fails, try on a command-line:"] \
          "\ntlmgr update --self\n" \
          [__ "Use an administrative command prompt for an admin install."]]]
-  return [$ans eq ok]
+  return [expr {$ans eq "ok"}]
 }
 
 proc update_tlmgr {} {