summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-10 01:09:24 +0000
committerKarl Berry <karl@freefriends.org>2008-07-10 01:09:24 +0000
commit629f3f4878aba699b17ddbcb7927e5883edcec74 (patch)
treea827058960bf353890eb66c1b6ba188ae1756982 /Master
parent612e532d2f3279cac32624b31decca25dc03f5b7 (diff)
semi-alphabetize options, more on -location
git-svn-id: svn://tug.org/texlive/trunk@9416 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl41
1 files changed, 26 insertions, 15 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 84147401924..bc1b3c3c898 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -310,7 +310,7 @@ $ENV{'WGETRC'}="$::installerdir/tlpkg/installer/wgetrc";
$location = $opt_location;
$location || ($location = "$::installerdir");
if ($location =~ m!^(http|ftp)://!i) {
- $location =~ s,/(tlpkg)?/*$,,; # remove any trailing tlpkg or /
+ $location =~ s,/(tlpkg|archive)?/*$,,; # remove any trailing tlpkg or /
$TeXLiveURL = $location;
$media = 'NET';
} else {
@@ -1284,18 +1284,23 @@ the language specified by the 2-letter language code. Currently supported
languages: English (en, default), German (de), French (fr), Dutch (nl),
Polish (pl) and Slovenian (sl).
-=item B<-profile> I<profile>
+item B<-location> I<url|path>
-Load the I<profile> file for repeated installations on different systems.
+Provide an installation source, either a local directory via
+C</path/to/directory> or a C<file:/> url, or a network location via
+a C<http://> or C<ftp://> url.
-=item B<-location> I<url|path>
+If the location is local, the installation type (compressed or live) is
+automatically determined, by checking for the presence of a
+C<tlpkg/archive> directory relative to the root. Compressed is
+preferred if both are available, since it is faster. Here's an example
+of using a local directory:
-Provide an installation source. If the given argument is on the local
-drives (either a path or a file:/ url) the installation type (compressed
-or live) is automatically determined. Giving an http: or ftp: location
-trailing C</> characters
-and/or a trailing C</tlpkg> component are ignored. For example, you
-could choose a particular CTAN mirror with something like:
+ -location /local/TL/repository/copy
+
+If the location is on the network, trailing C</> characters and/or
+trailing C</tlpkg> and C</archive> components are ignored. For example,
+you could choose a particular CTAN mirror with something like:
-location http://ctan.example.org/tex-archive/texlive/tlnet/2008
@@ -1304,23 +1309,29 @@ have to be specified. (The list of CTAN mirrors is maintained at
L<http://ctan.org/mirrors>.)
The default is to pick a mirror automatically, using
-L<http://mirror.ctan.org>; one mirror is used for the entire download.
+L<http://mirror.ctan.org>; the chosen mirror is used for the entire
+download. (See L<http://ctan.org> for more about the CTAN mirror
+services.)
=item B<-no-cls>
(only for text mode installer) do not clear the screen when entering
a new menu, for debugging purposes.
+=item B<-portable>
+
+Start the installer for portable use---but use the C<tl-portable>
+scripts instead of this option. See below for details.
+
=item B<-print-arch>
Print the detected arch-os combination and exit.
-=item B<-portable>
+=item B<-profile> I<profile>
-Start the installer for portable use---but use the C<tl-portable>
-scripts instead of this option. See below for details.
+Load the I<profile> file for repeated installations on different systems.
-=item B<-q>
+==item B<-q>
Omit normal informational messages.