summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-05-19 03:03:34 +0000
committerNorbert Preining <norbert@preining.info>2020-05-19 03:03:34 +0000
commitbb24aab36b14425d5408e5c0c889c83a70cc7a5a (patch)
treefacbdb453b615f64b1421387e38cfd43222f956a /systems/texlive/tlnet/install-tl
parent277978fd69546e800dd8c46a0aec0d859d475ebb (diff)
CTAN sync 202005190303
Diffstat (limited to 'systems/texlive/tlnet/install-tl')
-rwxr-xr-xsystems/texlive/tlnet/install-tl9
1 files changed, 5 insertions, 4 deletions
diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl
index ff70ef3241..6a0ea30b24 100755
--- a/systems/texlive/tlnet/install-tl
+++ b/systems/texlive/tlnet/install-tl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: install-tl 55126 2020-05-13 17:27:10Z karl $
+# $Id: install-tl 55199 2020-05-18 19:05:44Z 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: 55126 $';
+my $svnrev = '$Revision: 55199 $';
$svnrev =~ m/: ([0-9]+) /;
$::installerrevision = ($1 ? $1 : 'unknown');
@@ -946,11 +946,12 @@ sub do_installation {
$vars{'TEXDIR'} =~ s!/$!!;
# do the actual installation
make_var_skeleton "$vars{'TEXMFSYSVAR'}";
+ my $oldlocal = -d $vars{'TEXMFLOCAL'};
make_local_skeleton "$vars{'TEXMFLOCAL'}";
mkdirhier "$vars{'TEXMFSYSCONFIG'}";
if (win32()) {
TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFSYSVAR'});
- TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFLOCAL'});
+ TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFLOCAL'}) unless $oldlocal;
TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFSYSCONFIG'});
}
@@ -3204,7 +3205,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 55126 2020-05-13 17:27:10Z karl $
+$Id: install-tl 55199 2020-05-18 19:05:44Z siepo $
=cut
# to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html