summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2019-03-19 11:21:43 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2019-03-19 11:21:43 +0000
commit9a1a8a2646a32f1c3396a72cf0bb051aaf02fddd (patch)
treed413d8b0c2c07c3f1b4b4f59bca75572ac14b0d9 /Master
parentb24ec458caf5cc4da2529e72cd213ed24ffe327a (diff)
Fix for updating tlmgr; copyright now outside 'About' string
git-svn-id: svn://tug.org/texlive/trunk@50465 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/tlshell/tlshell.tcl21
1 files changed, 4 insertions, 17 deletions
diff --git a/Master/texmf-dist/scripts/tlshell/tlshell.tcl b/Master/texmf-dist/scripts/tlshell/tlshell.tcl
index 658e5313111..5d066d86740 100755
--- a/Master/texmf-dist/scripts/tlshell/tlshell.tcl
+++ b/Master/texmf-dist/scripts/tlshell/tlshell.tcl
@@ -523,18 +523,6 @@ proc run_cmd_waiting {cmd} {
# display_packages_info is mostly invoked by collect_filtered, but
# also when the search term or the search option changes.
-proc check_tlmgr_updatable {} {
- run_cmd_waiting "update --self --list"
- foreach l $::out_log {
- if [regexp {^total-bytes[ \t]+([0-9]+)$} $l m b] {
- do_debug "matches, $b"
- set ::need_update_tlmgr [expr {$b > 0 ? 1 : 0}]
- return
- }
- }
- do_debug "check_tlmgr_uptodate: should not get here"
-} ; # check_tlmgr_uptodate
-
proc is_updatable {nm} {
set pk [dict get $::pkgs $nm]
set lr [dict get $pk localrev]
@@ -548,7 +536,7 @@ proc update_globals {} {
foreach nm [dict keys $::pkgs] {
if [is_updatable $nm] {incr ::n_updates}
}
- check_tlmgr_updatable
+ set ::need_update_tlmgr [is_updatable texlive.infra]
set ::tlshell_updatable [is_updatable tlshell]
# also update displayed status info
@@ -1209,6 +1197,7 @@ proc repository_dialog {} {
ppack .tlr.abort -in .tlr.closebuttons -side right
bind .tlr <Escape> {.tlr.abort invoke}
+ wm protocol .tlr WM_DELETE_WINDOW {.tlr.abort invoke}
wm resizable .tlr 1 0
place_dlg .tlr .
} ; # repository_dialog
@@ -2022,11 +2011,9 @@ proc populate_main {} {
.mn add cascade -label [__ "Help"] -menu .mn.help -underline 0
menu .mn.help
.mn.help add command -label [__ "About"] -command {
- tk_messageBox -message [__ "Copyright 2017, 2018 Siep Kroonenberg
+ tk_messageBox -message [string cat "\u00a9 2017-2019 Siep Kroonenberg
-GUI interface for TeX Live Manager
-Implemented in Tcl/Tk
-"]}
+" [__ "GUI interface for TeX Live Manager\nImplemented in Tcl/Tk"]]}
.mn.help add command -label [__ "tlmgr help"] -command show_help
# wallpaper frame