From 95e8bfbba6ecd3d4a62c5745b2aea1c13b730850 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 8 Nov 2008 19:51:29 +0000 Subject: (init_tlmedia): one pattern is shorter than two. git-svn-id: svn://tug.org/texlive/trunk@11226 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgr.pl | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 3883fee0800..940a37a8a89 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -166,7 +166,7 @@ if ($action =~ m/^_include_tlpobj$/) { $tlpobj->from_file($f); # we now have to check whether that is a .doc or .src package, so shipping # src or doc files from a different package. - # We *really* should have that package already installed ... + # We should have that package already installed ... my $pkg = $tlpobj->name; if ($pkg =~ m/^(.*)\.(src|doc)$/) { # got a .src or .doc package @@ -2090,8 +2090,7 @@ sub check_collections { # uses the global $location. # sub init_tlmedia { - if (($location =~ m/$TeXLiveServerURL/) || - ($location =~ m/^ctan$/i)) { + if ($location =~ m/^($TeXLiveServerURL|ctan$)/) { $location = give_ctan_mirror(); } info("tlmgr: installation location $location\n"); @@ -2293,14 +2292,14 @@ that, see the option C<-v> below, and TeXLive::TLUtils. =item B<-pause> -This option make B wait for a user input before exiting. +This option make B wait for user input before exiting. =back -The standard options are also accepted: C<--help/-h/-?>, C<--version>, -C<-q> (no informational messages), C<-v> (debugging messages, can be -repeated). For the details about the latter, see the TeXLive::TLUtils -documentation. +The standard options for TeX Live programs are also accepted: +C<--help/-h/-?>, C<--version>, C<-q> (no informational messages), C<-v> +(debugging messages, can be repeated). For the details about these, see +the TeXLive::TLUtils documentation. The C<--version> option shows version information about the TeX Live release as well as the C script itself. @@ -2324,7 +2323,7 @@ Start the graphical user interface. =item B [I