summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-04-30 13:03:31 +0000
committerNorbert Preining <preining@logic.at>2008-04-30 13:03:31 +0000
commitcb8391b13a442b34f81043c300487750b52cd55f (patch)
tree9066f6609ba75bbcd21f87e4fe66526378d3c530
parentdc41d3d3721be2fe57879c995a5a33217bf1c1b8 (diff)
some changes
git-svn-id: svn://tug.org/texlive/trunk@7740 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tl-package-manager.pl10
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.tlu46
2 files changed, 37 insertions, 19 deletions
diff --git a/Master/texmf/scripts/texlive/tl-package-manager.pl b/Master/texmf/scripts/texlive/tl-package-manager.pl
index f5aec8d5718..135e8945978 100755
--- a/Master/texmf/scripts/texlive/tl-package-manager.pl
+++ b/Master/texmf/scripts/texlive/tl-package-manager.pl
@@ -46,7 +46,7 @@ use TeXLive::TLPDB;
use TeXLive::TLConfig;
use TeXLive::TLMedia;
use TeXLive::TLUtils;
-TeXLive::TLUtils->import( qw(kpsewhich) );
+TeXLive::TLUtils->import( qw(kpsewhich member) );
use Cwd qw/abs_path/;
use Getopt::Long;
use Pod::Usage;
@@ -161,10 +161,16 @@ if ($action =~ m/^generate$/i) {
# initialize the TLMedia from $location
$tlmediasrc = TeXLive::TLMedia->new($location);
my $mediatlpdb = $tlmediasrc->tlpdb;
+ my @already_installed_arch = $localtlpdb->available_architectures;
print "Available architectures:\n";
foreach my $a ($mediatlpdb->available_architectures) {
- print "\t$a\n";
+ if (member($a,@already_installed_arch)) {
+ print "(i) $a\n";
+ } else {
+ print " $a\n";
+ }
}
+ print "Already installed architectures are marked with (i)\n";
print "You can add new architectures with tlmgr arch add arch1 arch2\n";
exit(0);
} elsif ($what =~ m/^add$/i) {
diff --git a/Master/texmf/scripts/texlive/tlmgr.tlu b/Master/texmf/scripts/texlive/tlmgr.tlu
index 04676f448eb..fce19370c9d 100755
--- a/Master/texmf/scripts/texlive/tlmgr.tlu
+++ b/Master/texmf/scripts/texlive/tlmgr.tlu
@@ -110,26 +110,38 @@ if arg[1] == 'uninstall' then
print("Ok, cancelling the removal.")
os.exit(0)
end
-elseif arg[1] == 'generate-fmtutil' then
- script = findscript('generate-fmtutil.pl')
- if script then
- command = { perlbin, script }
- else
- os.exit(1)
- end
-elseif arg[1] == 'generate-language' then
- script = findscript('generate-language.pl')
- if script then
- command = { perlbin, script }
+elseif arg[1] == 'generate' then
+ if arg[2] == 'fmtutil' then
+ script = findscript('generate-fmtutil.pl')
+ if script then
+ command = { perlbin, script }
+ else
+ print("tlmgr: Cannot find generate-fmtutil.pl, strange!")
+ os.exit(1)
+ end
+ elseif arg[2] == 'language' then
+ script = findscript('generate-language.pl')
+ if script then
+ command = { perlbin, script }
+ else
+ print("tlmgr: Cannot find generate-language.pl, strange!")
+ os.exit(1)
+ end
+ elseif arg[2] == 'updmap' then
+ script = findscript('generate-updmap.pl')
+ if script then
+ command = { perlbin, script }
+ else
+ print("tlmgr: Cannot find generate-updmap.pl, strange!")
+ os.exit(1)
+ end
else
+ print ("tlmgr: Unknown or missing argument for generate!")
os.exit(1)
end
-elseif arg[1] == 'generate-updmap' then
- script = findscript('generate-updmap.pl')
- if script then
- command = { perlbin, script }
- else
- os.exit(1)
+ -- support plain help
+ if arg[3] == 'help' then
+ arg[3] = '-help'
end
elseif arg[1] == 'paper' or
arg[1] == 'dvips' or arg[1] == 'xdvi' or arg[1] == 'pdftex' or