summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-04-20 14:47:49 +0000
committerNorbert Preining <preining@logic.at>2017-04-20 14:47:49 +0000
commite016ffde13260cb8ac2b75bca1f3d3bb7e2250f9 (patch)
tree5e57d6e46c7ab32d9dcecf89d538307b41f14f56 /Master/texmf-dist
parent41ca4e53eb135aff20a0eba4cffdb2cfb65e10e5 (diff)
try to support https, too
git-svn-id: svn://tug.org/texlive/trunk@43940 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 6fda5f917ab..9d3a10fab0f 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -4037,9 +4037,9 @@ sub action_repository {
return ($F_ERROR);
}
# check if it is either url or absolute path
- if (($p !~ m!^(http|ftp)://!i) &&
+ if (($p !~ m!^(https?|ftp)://!i) &&
!File::Spec->file_name_is_absolute($p)) {
- tlwarn("$prg: neither http/ftp URL nor absolute path, no action: $p\n");
+ tlwarn("$prg: neither https?/ftp URL nor absolute path, no action: $p\n");
return ($F_ERROR);
}
my $t = shift @ARGV;
@@ -5784,7 +5784,7 @@ sub init_local_db {
# we normalize the path only if it is
# - a url starting with neither http or ftp
# - if we are on Windows, it does not start with Drive:[\/]
- if (! ( $location =~ m!^(http|ftp)://!i ||
+ if (! ( $location =~ m!^(https?|ftp)://!i ||
(win32() && (!(-e $location) || ($location =~ m!^.:[\\/]!) ) ) ) ) {
# seems to be a local path, try to normalize it
my $testloc = abs_path($location);
@@ -6026,7 +6026,7 @@ sub setup_one_remotetlpdb {
# not work
my $local_copy_tlpdb_used = 0;
- if ($location =~ m;^(http|ftp)://;) {
+ if ($location =~ m;^(https?|ftp)://;) {
# first check that the saved tlpdb is present at all
my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
my $loc_copy_of_remote_tlpdb =
@@ -6167,7 +6167,7 @@ FROZEN
# save remote database if it is a net location
# make sure that the writeout of the tlpdb is done in UNIX mode
# since otherwise the checksum will change.
- if (!$local_copy_tlpdb_used && $location =~ m;^(http|ftp)://;) {
+ if (!$local_copy_tlpdb_used && $location =~ m;^(https?|ftp)://;) {
my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
my $loc_copy_of_remote_tlpdb =
"$Master/$InfraLocation/texlive.tlpdb.$loc_digest";