summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-06-22 03:01:02 +0000
committerNorbert Preining <norbert@preining.info>2022-06-22 03:01:02 +0000
commitd6888fdb49e3ac954c2d436951f364d3a4a4b17d (patch)
tree6afde4b28d9150c5e111b3319fc5c475b8fd502c /systems/texlive/tlnet/install-tl
parent884ebedeec6018feff488351eff936cf5b56c030 (diff)
CTAN sync 202206220301
Diffstat (limited to 'systems/texlive/tlnet/install-tl')
-rwxr-xr-xsystems/texlive/tlnet/install-tl27
1 files changed, 20 insertions, 7 deletions
diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl
index 91f0c458d4..ee22319c78 100755
--- a/systems/texlive/tlnet/install-tl
+++ b/systems/texlive/tlnet/install-tl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: install-tl 63671 2022-06-20 22:41:54Z karl $
+# $Id: install-tl 63676 2022-06-21 00:09:29Z preining $
# Copyright 2007-2022
# Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg.
# This file is licensed under the GNU General Public License version 2
@@ -10,7 +10,7 @@
use strict; use warnings;
-my $svnrev = '$Revision: 63671 $';
+my $svnrev = '$Revision: 63676 $';
$svnrev =~ m/: ([0-9]+) /;
$::installerrevision = ($1 ? $1 : 'unknown');
@@ -1784,8 +1784,13 @@ sub set_texlive_default_dirs {
set_standard_var('TEXMFSYSCONFIG', 'TEXLIVE_INSTALL_TEXMFSYSCONFIG',
'texmfsysconfig', "$vars{'TEXDIR'}/texmf-config");
#
+ # TEXMFLOCAL is special because the default in texmf.cnf
+ # TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
+ # that is
+ # ..../texlive/texmf-local
+ #
set_standard_var('TEXMFLOCAL', 'TEXLIVE_INSTALL_TEXMFLOCAL',
- 'texmflocal', "$tex_prefix/texmf-local");
+ 'texmflocal', ($opt_texdir ? "$vars{'TEXDIR'}/texmf-local" :"$tex_prefix/texmf-local"));
#
set_standard_var('TEXMFHOME', 'TEXLIVE_INSTALL_TEXMFHOME',
'texmfhome', "$homedir/texmf");
@@ -2016,12 +2021,20 @@ END_EXPLICIT_MIRROR
$selscheme = $default_scheme;
}
if (!defined($tlpdb->get_package($selscheme))) {
+ # let us try scheme-minimal, and if also that is not available, scheme-infra
+ # which is required to be installed
if (!defined($tlpdb->get_package("scheme-minimal"))) {
- die("Aborting, cannot find either $selscheme or scheme-minimal");
+ if (!defined($tlpdb->get_package("scheme-infra"))) {
+ die("Aborting, cannot find either $selscheme or scheme-minimal or scheme-infra");
+ }
+ $default_scheme = "scheme-infra";
+ } else {
+ $default_scheme = "scheme-minimal";
}
- $default_scheme = "scheme-minimal";
tlwarn("$0: No $selscheme, switching to $default_scheme.\n");
$vars{'selected_scheme'} = $default_scheme;
+ } else {
+ $vars{'selected_scheme'} = $selscheme;
}
# make sure that we update %vars for collection_* if only selected_scheme
# is there, but no collection information
@@ -3514,7 +3527,7 @@ the two groups are quite analogous.
+----------------+--------------------------------------+--------------+------------------+
| tree | default | group change | single change |
+----------------+--------------------------------------+--------------+------------------+
- | TEXMFLOCAL | /usr/local/texlive/YYYY/texmf-local | --texdir | --texmflocal |
+ | TEXMFLOCAL | /usr/local/texlive/texmf-local | --texdir | --texmflocal |
| TEXMFSYSVAR | /usr/local/texlive/YYYY/texmf-var | --texdir | --texmfsysvar |
| TEXMFSYSCONFIG | /usr/local/texlive/YYYY/texmf-config | --texdir | --texmfsysconfig |
+----------------+--------------------------------------+--------------+------------------+
@@ -3554,7 +3567,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: install-tl 63671 2022-06-20 22:41:54Z karl $
+$Id: install-tl 63676 2022-06-21 00:09:29Z preining $
=cut
# to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html