From bd86f888704af73c7082e6ee7295b759acebcfcc Mon Sep 17 00:00:00 2001 From: Staszek Wawrykiewicz Date: Tue, 6 Feb 2007 12:02:32 +0000 Subject: tlpmgui 1.74 git-svn-id: svn://tug.org/texlive/trunk@3940 c570f23f-e606-0410-a88d-b1316a301751 --- Master/setuptl/Changelog | 3 +- Master/setuptl/msgs/sk.msg | 6 +- Master/setuptl/tlpm-darwin-univ-aqua.pl | 150 ++++++++++++++++++++++++++++++++ Master/setuptl/tlpmgui-i386-linux | Bin 2233468 -> 2234573 bytes Master/setuptl/tlpmgui-x86_64-linux | Bin 2496607 -> 2497702 bytes Master/setuptl/tlpmgui.exe | Bin 1257159 -> 1249933 bytes Master/setuptl/tlpmgui.kit | Bin 636185 -> 636678 bytes 7 files changed, 155 insertions(+), 4 deletions(-) create mode 100755 Master/setuptl/tlpm-darwin-univ-aqua.pl diff --git a/Master/setuptl/Changelog b/Master/setuptl/Changelog index 7bea67ce5d2..2ca38e4cfba 100644 --- a/Master/setuptl/Changelog +++ b/Master/setuptl/Changelog @@ -1,5 +1,5 @@ ## 2005-2007 Tomasz Luczak tlu@technodat.com.pl -# $Id: Changelog 345 2007-02-05 22:10:33Z tlu $ +# $Id: Changelog 350 2007-02-06 11:21:49Z tlu $ # History: # 2005.05.03 TLu r.0.1 start project # 2005.08.04 TLu r.0.11 last version for TL2004 @@ -39,3 +39,4 @@ # 2007.02.03 TLu r.1.71 full autorefresh, console window for Win32 # 2007.02.04 TLu r.1.72 resolved problem wrong %Temp% # 2007.02.05 TLu r.1.73 improved install perl under win32 +# 2007.02.06 TLu r.1.74 improved Next button and %Temp% with spaces diff --git a/Master/setuptl/msgs/sk.msg b/Master/setuptl/msgs/sk.msg index 2cc00730bee..b52cf20a88f 100644 --- a/Master/setuptl/msgs/sk.msg +++ b/Master/setuptl/msgs/sk.msg @@ -1,5 +1,5 @@ # -*- Tcl -*- -# $Id: sk.msg 345 2007-02-05 22:10:33Z tlu $ +# $Id: sk.msg 348 2007-02-06 09:10:40Z tlu $ # CZ translation of http://tug.org/texlive/devsrc/Master/setup-win32/msgs/translate_me.msg # by Petr Kolar, with corrections by Petr Sojka; utf8 encoding (hopefully) # --- new translations @@ -672,12 +672,12 @@ Vítejte do světa TeX Live!" # gui.tcl:71 ::msgcat::mcset sk\ "helpen.txt"\ -"helpcs.txt" +"helpsk.txt" # gui.tcl:71 ::msgcat::mcset sk\ "helpen"\ -"helpcs" +"helpsk" # guinb4.tcl ::msgcat::mcset sk\ diff --git a/Master/setuptl/tlpm-darwin-univ-aqua.pl b/Master/setuptl/tlpm-darwin-univ-aqua.pl new file mode 100755 index 00000000000..8d38165e6b8 --- /dev/null +++ b/Master/setuptl/tlpm-darwin-univ-aqua.pl @@ -0,0 +1,150 @@ +#!/usr/bin/env perl +# This file belongs to TLPM v2.21, TeX Live Package Manager +# Public Domain, P.Jackowski@gust.org.pl + +BEGIN{$tlpm_version="2.21";$tlpm_os="i386-darwin"} + +# the main tlpm script + +use TLPM::common; +use TLPM::constants; + +use TLPM::pkg; +use TLPM::reg; +use TLPM::cmdl; + +use TLPM::list; +use TLPM::incl; +use TLPM::blng; +use TLPM::inst; +use TLPM::uninst; +use TLPM::check; +use TLPM::help; +use TLPM::info; + +%commands = +( + 'exit' => sub {exit(0)}, + 'quit' => sub {exit(0)}, + 'list' => \&list, + 'incl' => \&incl, + 'blng' => \&blng, + 'inst' => \&inst, + 'uninst' => \&uninst, + 'check' => \&check, + 'info' => \&info, + 'help' => \&help, +# 'Help' => \&readme, +# 'readme' => \&readme, +# 'version' => \&version, + 'cmd' => \&sys, + 'set' => \&set +); + +# interactive mode + +sub prompt +{ + local ($cmd_name,@cmd_args,$cmd_line); + while($true) + { + print STDOUT $tlpm_prompt; + $cmd_line = ; + exit(0) unless defined $cmd_line; # otherwise looop after 'echo | tlpm' + chomp $cmd_line; + &execute_cmd(); + } +} + +# batch mode + +sub batch +{ + local ($cmd_name,@cmd_args,$cmd_line); + local *INP; + &norm_path($batch_file); + $batch_file = &rel2abs($batch_file,$curr_dir); + open(INP,"<$batch_file") or exit $error{'wrong_inp'} -> ($batch_file); + $message -> ("Executing batch file '$batch_file'"); + foreach $cmd_line () + { + exit(0) unless defined $cmd_line; + chomp $cmd_line; + next if $cmd_line =~ /\A\s*(%|#|\z)/; # comment + print STDOUT $tlpm_prompt . $cmd_line . "\n"; + &execute_cmd(); + } + close INP; +} + +sub execute_cmd +{ + my $err; + &resolve_env($cmd_line); + &set_out($cmd_line); + &open_out(); + @cmd_args = &parse_cmd($cmd_line); + return(0) unless @cmd_args; # return prompt on ENTER + $cmd_name = shift @cmd_args; + if(defined $commands{$cmd_name}) + { + $err = $commands{$cmd_name} -> (@cmd_args); + } + else + { + $err = $error{'wrong_cmd'} -> ($cmd_name,'help'); + } + &close_out(); + return $err; +} + +# the main procedure + +sub main +{ + my ($arg,@args); + @args = &parse_cmd(join(" ",@ARGV)); + while(defined($arg = shift @args)) + { + $arg eq '' and next +# or &no_opt($arg) and return $error{'wrong_cmd'} -> ($arg,'tlpm --help') + or &no_opt($arg) and do {$tl_binaries{$arg} = $true} + or &is_opt($arg,'d','directory') and do {$tl_target = shift @args;1} + or &is_opt($arg,'s','source') and do {$tl_source = shift @args;1} + or &is_opt($arg,'v','version') and return $heeelp -> ('tlpm_banner') + or &is_opt($arg,'h','help') and return &help(shift @args) + or &is_opt($arg,'H','Help','readme') and return &readme() + or &is_opt($arg,'b','batch') and do {$batch_file = shift @args;$batch_mode = 1} +# or &is_opt($arg,'q','quiet') and do {$quiet_mode = 1} + or &is_opt($arg,'D','debug') and do {&enable_dbg();} + or &rem_opt($arg) and return $error{'wrong_opt'} -> ($arg,'tlpm --help'); + } + unless(defined $tl_source){$tl_source = $ENV{'tl_source'}}# ...or remains undefined + unless(defined $tl_target){$tl_target = $ENV{'tl_target'}} + $tl_source_indeed = $false; # we need to check the source availability anyway + unless(defined %tl_binaries) # new; installing not only native binaries + { + %tl_binaries = ($tlpm_os => $true); + } + $tl_target_indeed = $false; + if($batch_mode) + { + &batch($batch_file); + } + else + { + $heeelp -> ('tlpm_banner'); + $heeelp -> ('type_help'); + &prompt(); + } +} + +#$quiet_mode = 0; +¬2log(); +&disable_dbg(); +$batch_mode = 0; +$batch_file = ''; + +&main(); + +# uff diff --git a/Master/setuptl/tlpmgui-i386-linux b/Master/setuptl/tlpmgui-i386-linux index a0cbcbc8933..5e74fa33c14 100755 Binary files a/Master/setuptl/tlpmgui-i386-linux and b/Master/setuptl/tlpmgui-i386-linux differ diff --git a/Master/setuptl/tlpmgui-x86_64-linux b/Master/setuptl/tlpmgui-x86_64-linux index cfe3529f71a..18e215294c2 100755 Binary files a/Master/setuptl/tlpmgui-x86_64-linux and b/Master/setuptl/tlpmgui-x86_64-linux differ diff --git a/Master/setuptl/tlpmgui.exe b/Master/setuptl/tlpmgui.exe index e5f0e595b1e..b9fc512f235 100644 Binary files a/Master/setuptl/tlpmgui.exe and b/Master/setuptl/tlpmgui.exe differ diff --git a/Master/setuptl/tlpmgui.kit b/Master/setuptl/tlpmgui.kit index 49614632ab3..4f674b18651 100644 Binary files a/Master/setuptl/tlpmgui.kit and b/Master/setuptl/tlpmgui.kit differ -- cgit v1.2.3