From 893b65e5d4c0b7cb8ebbfca9ee6b090b9a4a182c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 14 Jun 2020 03:02:26 +0000 Subject: CTAN sync 202006140302 --- systems/texlive/tlnet/install-tl | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'systems/texlive/tlnet/install-tl') diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl index 40549712ca..7d3f5c2bfd 100755 --- a/systems/texlive/tlnet/install-tl +++ b/systems/texlive/tlnet/install-tl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: install-tl 55357 2020-05-31 20:09:55Z siepo $ +# $Id: install-tl 55535 2020-06-13 20:03:38Z siepo $ # Copyright 2007-2020 # Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg. # This file is licensed under the GNU General Public License version 2 @@ -8,7 +8,7 @@ # Be careful when changing wording: *every* normal informational message # output here must be recognized by the long grep in tl-update-tlnet. -my $svnrev = '$Revision: 55357 $'; +my $svnrev = '$Revision: 55535 $'; $svnrev =~ m/: ([0-9]+) /; $::installerrevision = ($1 ? $1 : 'unknown'); @@ -1331,13 +1331,14 @@ sub do_texmf_cnf { my $yyyy = $TeXLive::TLConfig::ReleaseYear; # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME + # at this point, a final slash of $vars{TEXDIR} itself has already + # been removed. foreach my $line (@texmfcnflines) { if ($line =~ m/^TEXMFLOCAL\b/) { # don't find TEXMFLOCALEDIR # by default TEXMFLOCAL = TEXDIR/../texmf-local, if this is the case # we don't have to write a new setting. - my $deftmlocal = dirname($vars{'TEXDIR'}); - $deftmlocal .= "/texmf-local"; - if ("$vars{'TEXMFLOCAL'}" ne "$deftmlocal") { + my $deftmflocal = Cwd::abs_path($vars{'TEXDIR'}.'/../texmf-local'); + if (Cwd::abs_path($vars{TEXMFLOCAL}) ne "$deftmflocal") { push @changedtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n"; } } elsif ($line =~ m/^TEXMFSYSVAR/) { @@ -1348,15 +1349,15 @@ sub do_texmf_cnf { if ("$vars{'TEXMFSYSCONFIG'}" ne "$vars{'TEXDIR'}/texmf-config") { push @changedtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n"; } - } elsif ($line =~ m/^TEXMFVAR/) { + } elsif ($line =~ m/^TEXMFVAR/ && !$vars{'instopt_portable'}) { if ($vars{"TEXMFVAR"} ne "~/.texlive$yyyy/texmf-var") { push @changedtmf, "TEXMFVAR = $vars{'TEXMFVAR'}\n"; } - } elsif ($line =~ m/^TEXMFCONFIG/) { + } elsif ($line =~ m/^TEXMFCONFIG/ && !$vars{'instopt_portable'}) { if ("$vars{'TEXMFCONFIG'}" ne "~/.texlive$yyyy/texmf-config") { push @changedtmf, "TEXMFCONFIG = $vars{'TEXMFCONFIG'}\n"; } - } elsif ($line =~ m/^TEXMFHOME/) { + } elsif ($line =~ m/^TEXMFHOME/ && !$vars{'instopt_portable'}) { if ("$vars{'TEXMFHOME'}" ne "~/texmf") { push @changedtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n"; } @@ -1392,6 +1393,11 @@ EOF s/^(TEXMF\w+\s*=\s*)\Q$vars{'TEXDIR'}\E/$1\$SELFAUTOPARENT/; print TMF; } + if ($vars{'instopt_portable'}) { + print TMF "TEXMFHOME = \$TEXMFLOCAL\n"; + print TMF "TEXMFVAR = \$TEXMFSYSVAR\n"; + print TMF "TEXMFCONFIG = \$TEXMFSYSCONFIG\n"; + } # # save the setting of shell_escape to the generated system texmf.cnf # default in texmf-dist/web2c/texmf.cnf is @@ -3129,7 +3135,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: install-tl 55357 2020-05-31 20:09:55Z siepo $ +$Id: install-tl 55535 2020-06-13 20:03:38Z siepo $ =cut # to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html -- cgit v1.2.3