summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-05 23:40:54 +0000
committerKarl Berry <karl@freefriends.org>2011-11-05 23:40:54 +0000
commitf9b4593f28389832c5573550b53b9e5569163cf8 (patch)
tree8486c13e5eeb51bccdd926bedd693096a9e0e17f /Build
parent2632cfd91ace0a6428f33d057fb0c51e23fbab76 (diff)
musixtex 10-26-2011 (27oct11)
git-svn-id: svn://tug.org/texlive/trunk@24518 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl41
1 files changed, 32 insertions, 9 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index f6cfb8ff1fc..93fd96fc4c4 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 23514 2011-08-12 21:36:21Z karl $
+# $Id: tlmgr.pl 24419 2011-10-27 14:06:37Z preining $
#
# Copyright 2008, 2009, 2010, 2011 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 23514 $';
-my $datrev = '$Date: 2011-08-12 23:36:21 +0200 (Fri, 12 Aug 2011) $';
+my $svnrev = '$Revision: 24419 $';
+my $datrev = '$Date: 2011-10-27 16:06:37 +0200 (Thu, 27 Oct 2011) $';
my $tlmgrrevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$tlmgrrevision = $1;
@@ -127,9 +127,14 @@ sub main {
"pause" => 1,
"print-platform|print-arch" => 1,
"version" => 1,
- "help|h|?" => 1);
+ "help" => 1,
+ "h|?" => 1);
my %actionoptions = (
+ "get-mirror" => { },
+ "option" => { },
+ "conf" => { },
+ "version" => { },
"backup" => { "backupdir" => "=s",
"clean" => ":-99",
"all" => 1,
@@ -256,11 +261,11 @@ sub main {
exit 0;
}
- if ((!defined($action) || !$action) && !$opts{"help"}) {
+ if ((!defined($action) || !$action) && !$opts{"help"} && !$opts{"h"}) {
die "$0: missing action; try --help if you need it.\n";
}
- if ($opts{"help"}) {
+ if ($opts{"help"} || $opts{"h"}) {
# perldoc does ASCII emphasis on the output, so it's nice to use it.
# But not all Unix platforms have it, and on Windows our Config.pm
# can apparently interfere, so always skip it there.
@@ -282,7 +287,23 @@ sub main {
pod2usage(-exitstatus => 0, -verbose => 99,
-sections => "NAME|SYNOPSIS|ACTIONS/$action.*" , @noperldoc);
} else {
- pod2usage(-exitstatus => 0, -verbose => 2, @noperldoc);
+ if ($opts{"help"}) {
+ pod2usage(-exitstatus => 0, -verbose => 2, @noperldoc);
+ } else {
+ # give a short message about usage
+ print "
+tlmgr revision $tlmgrrevision
+usage: tlmgr <options> <action> <arguments>
+where <action> is one of:\n";
+ for my $k (sort keys %actionoptions) {
+ print " $k\n";
+ }
+ print "\nUse\n tlmgr <action> --help
+for more details on a specific option, and
+ tlmgr --help
+for the full story.\n";
+ exit 0;
+ }
}
}
@@ -4083,10 +4104,12 @@ sub check_executes {
my (%maps,%langcodes,%fmtlines);
for my $pkg ($localtlpdb->list_packages) {
for my $e ($localtlpdb->get_package($pkg)->executes) {
- if ($e =~ m/add(Mixed)?Map\s+(.*)$/) {
+ if ($e =~ m/add(Mixed|Kanji)?Map\s+(.*)$/) {
my $foo = $2;
chomp($foo);
- push @{$maps{$foo}}, $pkg;
+ if ($foo !~ m/\@kanjiEmbed@/) {
+ push @{$maps{$foo}}, $pkg;
+ }
} elsif ($e =~ m/AddFormat\s+(.*)$/) {
my $foo = $1;
chomp($foo);