diff options
| author | Karl Berry <karl@freefriends.org> | 2008-08-05 00:48:07 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-08-05 00:48:07 +0000 |
| commit | f3ed5abf6d5cfcc2f9d5230f1fbf472358741c93 (patch) | |
| tree | ddfc0c3f924e3456a2545439ac99b1ac257ca5bd /Master/tlpkg/installer | |
| parent | fa51d9777c2dfae30d8718ff430c26c7e8bc8bde (diff) | |
use win32() not win32 to avoid -w complaints;
tweak statusbar texts.
git-svn-id: svn://tug.org/texlive/trunk@10081 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer')
| -rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index aea9f49b102..04eb4ef8a69 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -1,5 +1,4 @@ #!/usr/bin/env perl -# # $Id$ # # Copyright 2008 Norbert Preining, Reinhard Kotucha @@ -81,13 +80,12 @@ my $optfmtstate; my $optsrcstate; my $optdocstate; -push @::start_install_hook, sub { update_statusbar("Starting Installation"); - Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; -push @::start_postinst_hook, sub { update_statusbar("Starting Post Installation Jobs"); - Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; - +push @::start_install_hook, sub { update_statusbar("Starting installation"); + Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT);}; +push @::start_postinst_hook, sub { update_statusbar("Starting post-installation Jobs"); + Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT);}; push @::end_install_hook, sub { update_statusbar("Installation finished"); - Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT); }; + Tk::DoOneEvent(Tk::Event::DONT_WAIT); Tk::DoOneEvent(Tk::Event::DONT_WAIT);}; push @::install_packages_hook, \&update_statusbar; # no idea how many of those are necessary, 1 is definitely not enough! @@ -574,7 +572,7 @@ sub menu_select_symlink { sub return_callback { if ($osym) { my $home = getenv('HOME'); - $home = getenv('USERPROFILE') if (win32); + $home = getenv('USERPROFILE') if (win32()); $home ||= '~'; $lbin =~ s/^~/$home/; $linfo =~ s/^~/$home/; @@ -750,7 +748,7 @@ sub callback_select_systems() { sub callback_edit_directories { my ($key,$val) = @_; my $home = getenv('HOME'); - $home = getenv('USERPROFILE') if (win32); + $home = getenv('USERPROFILE') if (win32()); $home ||= '~'; $vars{$key} = $val; $vars{'TEXDIR'} =~ s/^~/$home/; |