texlive[51840] Master/install-tl: (only_load_remote): ignore trailing

commits+karl at tug.org commits+karl at tug.org
Thu Aug 8 00:27:00 CEST 2019


Revision: 51840
          http://tug.org/svn/texlive?view=revision&revision=51840
Author:   karl
Date:     2019-08-08 00:27:00 +0200 (Thu, 08 Aug 2019)
Log Message:
-----------
(only_load_remote): ignore trailing
/texlive.tlpdb, too.

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2019-08-07 22:23:26 UTC (rev 51839)
+++ trunk/Master/install-tl	2019-08-07 22:27:00 UTC (rev 51840)
@@ -775,7 +775,8 @@
   $location = $selected_location if defined($selected_location);
   $location || ($location = "$::installerdir");
   if ($location =~ m!^(ctan$|(https?|ftp)://)!i) {
-    $location =~ s,/(tlpkg|archive)?/*$,,;  # remove any trailing tlpkg or /
+    # remove any trailing tlpkg[/texlive.tlpdb] or /
+    $location =~ s,/(tlpkg(/texlive\.tlpdb)?|archive)?/*$,,;
     if ($location =~ m/^ctan$/i) {
       $location = TeXLive::TLUtils::give_ctan_mirror();
     } elsif ($location =~ m/^$TeXLiveServerURL/) {



More information about the tex-live-commits mailing list