diff options
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/install-tl | 3 | ||||
-rwxr-xr-x | Master/texmf/scripts/texlive/texconf.tlu | 23 | ||||
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 21 | ||||
-rw-r--r-- | Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl | 12 | ||||
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl | 7 | ||||
-rw-r--r-- | Master/texmf/scripts/texlive/uninstall-win32.pl | 2 |
6 files changed, 59 insertions, 9 deletions
diff --git a/Master/install-tl b/Master/install-tl index 45a4eac98e6..efc9c357c74 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -290,6 +290,9 @@ initialize_installer(); setup_programs("$::installerdir/tlpkg/installer", "$::_platform_"); load_tlpdb(); +info("Installer revision: $::installerrevision\n"); +info("Database revision: " . $tlpdb->config_revision . "\n"); + # correctly set the splitting support # for DVD we always support splitting if ((media() eq "NET") || (media() eq "CD")) { diff --git a/Master/texmf/scripts/texlive/texconf.tlu b/Master/texmf/scripts/texlive/texconf.tlu index 1627718b168..cca5629916e 100755 --- a/Master/texmf/scripts/texlive/texconf.tlu +++ b/Master/texmf/scripts/texlive/texconf.tlu @@ -56,6 +56,9 @@ end if (sys) then texmfconfig=kpse.var_value('TEXMFSYSCONFIG') + os.setenv('TEXMFCONFIG', texmfconfig) + texmfsysvar=kpse.var_value('TEXMFSYSVAR') + os.setenv('TEXMFVAR', texmfsysvar) else texmfconfig=kpse.var_value('TEXMFCONFIG') -- workaround for texlua, new kpathsea which expands '~' not @@ -509,7 +512,9 @@ function usage_main() 'pdftex paper PAPER (pdftex paper size)', 'dvipdfm paper PAPER (dvipdfm paper size)', 'dvipdfmx paper PAPER (dvipdfmx paper size)', - 'paper [a4|letter] (paper size for all programs)' + 'paper [a4|letter] (paper size for all programs)', + 'init [FORMAT] ... (rebuild FORMATs, or all formats plus run updmap)', + 'rehash (rebuild ls-R files with mktexlsr)' } io.stdout:write('Usage:\n') for i, msg in ipairs(usage) do @@ -547,6 +552,22 @@ elseif arg[1] == 'paper' then else set_papersize(arg[2]) end +elseif arg[1] == 'rehash' then + command = { "mktexlsr" } + command = fixwin(command) + os.exec(command) + -- does not return +elseif arg[1] == 'init' then + if arg[2] == nil then + -- we have set TEXMFCONFIG and TEXMFVAR to the SYS variants above, + -- so we can run the normal fmtutil/updmap program + os.execute('fmtutil --all') + os.execute('updmap') + else + for i=2, #arg do + os.execute('fmtutil --byfmt "'..arg[i]..'"') + end + end elseif arg[1] == 'dvips' or arg[1] == 'xdvi' or arg[1] == 'pdftex' or arg[1] == 'dvipdfm' or arg[1] == 'dvipdfmx' then if arg[2] == 'help' or arg[2] == nil then diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 84dd1cbc426..22984e66541 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 6381 2008-01-23 17:50:54Z preining $ +# $Id$ # # Copyright 2008 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -10,6 +10,10 @@ # - (?) removal does not remove created format files from TEXMFSYSVAR # - other features: dependency check?, ...? +my $svnrev = '$Revision$'; +$svnrev =~ m/: ([0-9]+) /; +my $tlmgrrevision = $1; + my $Master; BEGIN { @@ -47,6 +51,7 @@ my $location; # option handling my $opt_location; my $opt_help = 0; +my $opt_version = 0; my $opt_netarchive; my $opt_diskarchive; my $opt_gui = 0; @@ -57,10 +62,20 @@ GetOptions("location=s" => \$opt_location, "netarchive=s" => \$opt_netarchive, "diskarchive=s" => \$opt_diskarchive, "gui" => \$opt_gui, + "version" => \$opt_version, "h|help|?" => \$opt_help) or pod2usage(2); my $action = shift; +if (!defined($action) && $opt_gui) { + $action = "gui"; +} + +if ($opt_version) { + print "tlmgr revision $tlmgrrevision\n"; + exit(0); +} + if (!defined($action) && !$opt_help) { print "missing action\ntry 'tlmgr help' for more information.\n"; exit 1; @@ -1141,6 +1156,10 @@ Overrides the default settings for netarchive. Should be used with care. Overrides the default settings for diskarchive. Should be used with care. +=item B<--version> + +Echos the tlmgr.pl script's revision number and exits. + =back The standard options B<--help/-h/-?> and B<--debug> are also accepted. diff --git a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl index 6187a5d1c9e..96cd9d8c72e 100644 --- a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl @@ -1,5 +1,5 @@ # guinb1.pl -# $Id: gui-install.pl 7929 2008-05-08 05:35:51Z preining $ +# $Id$ # # Copyright 2008 Tomasz Luczak, Norbert Preining # @@ -97,6 +97,7 @@ sub update_info_window { } $iw->delete("0.0", "end"); $iw->insert("0.0", "$text"); + $iw->see("0.0"); } sub do_listframe { @@ -158,9 +159,14 @@ sub do_listframe { $f_textf->grid(-row => 2, -column => 2, -sticky => "nswe", -padx => "2m", -pady => "1m"); + # we would like to have -scrollbars => "oe" here so that it does disappear + # if the text is not too long, but this doesn't work since Windows Perl/Tk + # is broken and does not update the scrollbar properly, you have to first + # select something while scrolling, then finally it works. Ok, so show + # it all the time ... $f_textf_text = $f_textf->Scrolled("ROText", - -scrollbars => "osoe", - -width => 45, -wrap => "none"); + -scrollbars => "e", + -width => 45, -wrap => "word"); $f_textf_text->insert("end", "\nAttention.\nPlease check using \"Change\" button if a DVD drive with the TeX Live DVD\nor the correct network address is properly selected,\nthen press \"Load\" button."); $f_textf_text->pack(-expand => 1, -fill => "both"); diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl index 90d0db8266e..0b6648c3b11 100755 --- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl +++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl @@ -201,10 +201,11 @@ sub init_install_media { } sub run_program_show_output { - my $td = $mw->Toplevel(-title => "$_[1] process"); - my $tf = $td->Scrolled("ROText", -width => 50, + my $td = $mw->Toplevel(-title => "tlmgr process"); + my $tf = $td->Scrolled("ROText", -width => 80, + -height => 10, -wrap => "none", - -scrollbars => "osoe" + -scrollbars => "ose" )->pack(-expand => 1, -fill => "both"); my $ok = $td->Button(-text => "OK", -padx => "3m", -pady => "3m", -command => sub { $td->destroy; }); diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl index 002e4983aab..ed7e29c8d58 100644 --- a/Master/texmf/scripts/texlive/uninstall-win32.pl +++ b/Master/texmf/scripts/texlive/uninstall-win32.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# $Id: uninstall-win32.pl 7822 2008-05-03 14:42:15Z preining $ +# $Id$ # # Copyright 2008 Norbert Preining # |