summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-17 21:32:21 +0000
committerKarl Berry <karl@freefriends.org>2020-03-17 21:32:21 +0000
commit636cbf03f6dcdc84f121e242abcf036015800524 (patch)
tree7b9733c2f72e4c4483bb2840616755819aa59d8c /Build
parentf853b6bb8fe5ed8eea324afcd32ad325056fe1e2 (diff)
l3build (17mar20)
git-svn-id: svn://tug.org/texlive/trunk@54379 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl13
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl31
3 files changed, 22 insertions, 24 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index f2632f1724e..63eed703068 100644
--- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
+++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2020-03-13"
+release_date = "2020-03-16"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index e76604ba58d..b7d21cf0111 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 54286 2020-03-13 22:01:43Z karl $
+# $Id: tlmgr.pl 54357 2020-03-16 20:54:33Z karl $
#
# Copyright 2008-2020 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 54286 $';
-my $datrev = '$Date: 2020-03-13 23:01:43 +0100 (Fri, 13 Mar 2020) $';
+my $svnrev = '$Revision: 54357 $';
+my $datrev = '$Date: 2020-03-16 21:54:33 +0100 (Mon, 16 Mar 2020) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -2833,7 +2833,8 @@ sub action_update {
" collection, not auto-installing it!\n");
next;
} else {
- tlwarn("\n$prg: $pkg mentioned, but neither new nor forcibly removed\n");
+ tlwarn("\n$prg: $pkg mentioned, but neither new nor forcibly removed");
+ tlwarn("\n$prg: perhaps try tlmgr search or tlmgr info.\n");
next;
}
# install new packages
@@ -3517,7 +3518,7 @@ sub action_update {
}
# infra update and tlmgr restart on w32 is done by the updater batch script
- if (win32() && !$opts{"list"} && @critical) {
+ if (win32() && $opts{'self'} && !$opts{"list"} && @critical) {
info("$prg: Preparing TeX Live infrastructure update...\n");
for my $f (@infra_files_to_be_removed) {
debug("file scheduled for removal $f\n");
@@ -10010,7 +10011,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 54286 2020-03-13 22:01:43Z karl $
+$Id: tlmgr.pl 54357 2020-03-16 20:54:33Z karl $
=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 4ddc53509ea..24ae2ea74ae 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -14,10 +14,6 @@ catch {rename send {}}
# 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]
- cd $texbin
- set texbin [pwd]
- cd $savedir
# prepend texbin to PATH, unless it is already the _first_
# path component
set dirs [split $::env(PATH) ":"]
@@ -25,7 +21,6 @@ if {$::tcl_platform(platform) ne "windows"} {
set ::env(PATH) "${texbin}:$::env(PATH)"
}
unset texbin
- unset savedir
unset dirs
}
@@ -364,6 +359,12 @@ proc start_tlmgr {{args ""}} {
# to process initial tlmgr output before continuing.
unset -nocomplain ::done_waiting
do_debug "opening tlmgr"
+ # -gui -. -gui-lang
+ for {set i 0} {$i < [llength $args]} {incr i} {
+ if {[lindex $args $i] eq "-lang"} {
+ set args [lreplace $args $i $i "-gui-lang"]
+ }
+ }
set cmd [list "|tlmgr" {*}$args "--machine-readable" "shell" 2>>$::err_file]
if [catch {open $cmd w+} ::tlshl] {
tk_messageBox -message [get_stacktrace]
@@ -1578,17 +1579,6 @@ proc restore_backups_dialog {} {
proc update_tlmgr_w32 {} {
close_tlmgr
- # cannot overwrite runscript.dll because it is in use.
- # move it aside instead and put a copy in its place.
- set runbk [file join $::instroot "temp" "runbk"]
- if [file exists $runbk] {
- file delete -force $runbk
- }
- file mkdir $runbk
- file rename -force -- "${::instroot}/bin/win32/runscript.dll" $runbk
- file copy "$runbk/runscript.dll" "${::instroot}/bin/win32"
- # tell tlmgr via an environment variable that it was invoked by tlshell
- set ::env(from_tcl) 1
# don't try pipes or capturing, because of
# tlmgr's acrobatics with nested command prompts
wm iconify .
@@ -2163,6 +2153,13 @@ proc populate_main {} {
# top of main window
ppack [ttk::frame .topf] -in .bg -side top -anchor w -fill x
+ if $::ddebug {
+ ppack [ttk::label .topf.test -text [info nameofexecutable]]
+ ppack [ttk::label .topf.test2 -text $::progname]
+ ppack [ttk::label .topf.test3 -text \
+ [string range $::env(PATH) 0 59]]
+ }
+
# left frame
pack [ttk::frame .topfl] -in .topf -side left -anchor nw
@@ -2397,7 +2394,7 @@ proc initialize {} {
if {$ans ne "yes"} {exit}
}
- start_tlmgr
+ start_tlmgr {*}$::argv
if {$::tcl_platform(platform) eq "windows"} {
run_cmd_waiting "option multiuser"
set ::multiuser 0