diff options
author | Norbert Preining <norbert@preining.info> | 2022-06-21 03:01:01 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-06-21 03:01:01 +0000 |
commit | 884ebedeec6018feff488351eff936cf5b56c030 (patch) | |
tree | d9870d60c056ad8828c2a53023fedd31e87a0792 /systems/texlive/tlnet/install-tl | |
parent | d1dd8ea4ff1d6807ae7c5ee72de330c33e166131 (diff) |
CTAN sync 202206210301
Diffstat (limited to 'systems/texlive/tlnet/install-tl')
-rwxr-xr-x | systems/texlive/tlnet/install-tl | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl index 6d44161b7c..91f0c458d4 100755 --- a/systems/texlive/tlnet/install-tl +++ b/systems/texlive/tlnet/install-tl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-tl 63655 2022-06-19 21:51:29Z karl $ +# $Id: install-tl 63671 2022-06-20 22:41:54Z karl $ # 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: 63655 $'; +my $svnrev = '$Revision: 63671 $'; $svnrev =~ m/: ([0-9]+) /; $::installerrevision = ($1 ? $1 : 'unknown'); @@ -1176,12 +1176,12 @@ sub run_postinst_cmd { # and more. Return count of errors detected, hopefully zero. # sub do_postinst_stuff { - my $TEXDIR = "$vars{'TEXDIR'}"; - my $TEXMFSYSVAR = "$vars{'TEXMFSYSVAR'}"; - my $TEXMFSYSCONFIG = "$vars{'TEXMFSYSCONFIG'}"; - my $TEXMFVAR = "$vars{'TEXMFVAR'}"; - my $TEXMFCONFIG = "$vars{'TEXMFCONFIG'}"; - my $TEXMFLOCAL = "$vars{'TEXMFLOCAL'}"; + my $TEXDIR = $vars{'TEXDIR'}; + my $TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}; + my $TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}; + my $TEXMFVAR = $vars{'TEXMFVAR'}; + my $TEXMFCONFIG = $vars{'TEXMFCONFIG'}; + my $TEXMFLOCAL = $vars{'TEXMFLOCAL'}; my $tmv; do_texmf_cnf(); @@ -1767,15 +1767,17 @@ sub set_texlive_default_dirs { } # first set $tex_prefix my $tex_prefix; - set_var_from_alternatives( "TEX_PREFIX", \$tex_prefix, + set_var_from_alternatives("TEX_PREFIX", \$tex_prefix, ($opt_in_place ? abs_path($::installerdir) : undef), $tlprefixenv, (win32() ? getenv('SystemDrive') . '/texlive' : '/usr/local/texlive')); - set_var_from_alternatives( "TEXDIR", \$vars{'TEXDIR'}, + # + set_var_from_alternatives("TEXDIR", \$vars{'TEXDIR'}, $opt_texdir, $vars{'TEXDIR'}, ($vars{'instopt_portable'} || $opt_in_place) ? $tex_prefix : "$tex_prefix/$texlive_release"); + # set_standard_var('TEXMFSYSVAR', 'TEXLIVE_INSTALL_TEXMFSYSVAR', 'texmfsysvar', "$vars{'TEXDIR'}/texmf-var"); # @@ -1783,7 +1785,7 @@ sub set_texlive_default_dirs { 'texmfsysconfig', "$vars{'TEXDIR'}/texmf-config"); # set_standard_var('TEXMFLOCAL', 'TEXLIVE_INSTALL_TEXMFLOCAL', - 'texmflocal', "$vars{'TEXDIR'}/texmf-local"); + 'texmflocal', "$tex_prefix/texmf-local"); # set_standard_var('TEXMFHOME', 'TEXLIVE_INSTALL_TEXMFHOME', 'texmfhome', "$homedir/texmf"); @@ -3552,7 +3554,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 63655 2022-06-19 21:51:29Z karl $ +$Id: install-tl 63671 2022-06-20 22:41:54Z karl $ =cut # to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html |