summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLPDB.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-05-24 03:08:27 +0000
committerNorbert Preining <preining@logic.at>2018-05-24 03:08:27 +0000
commit7895df6ab5d011bd09484b5aba16db682a2621e9 (patch)
treeaa6e25725d18fece2089cfba8fd2eec378d59fca /Master/tlpkg/TeXLive/TLPDB.pm
parentd73f728b5ea3ef4a3a8fd60ba9a264bded6dd5ad (diff)
support ssh://user@host/path as well as scp://...
git-svn-id: svn://tug.org/texlive/trunk@47823 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index e8a6ca878ac..7c19c9a805e 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -116,10 +116,10 @@ my $_listdir;
C<< TeXLive::TLPDB->new >> creates a new C<TLPDB> object. If the
argument C<root> is given it will be initialized from the respective
-location starting at $path. If C<$path> begins with C<http://> or
-C<ftp://>, the program C<wget> is used to download the file. The
-C<$path> can also start with C<file:/> in which case it is treated as a
-file on the filesystem in the usual way.
+location starting at $path. If C<$path> begins with C<http://>, C<https://>,
+C<ftp://>, C<scp://>, C<ssh://> or C<I<user>@I<host>:>, the respective file
+is downloaded. The C<$path> can also start with C<file:/> in which case it
+is treated as a file on the filesystem in the usual way.
Returns an object of type C<TeXLive::TLPDB>, or undef if the root was
given but no package could be read from that location.
@@ -283,7 +283,7 @@ sub from_file {
my $rootpath = $self->root;
if ($rootpath =~ m,https?://|ftp://,) {
$media = 'NET';
- } elsif ($rootpath =~ m,^[^@]*@[^:]*:,) {
+ } elsif ($rootpath =~ m,$TeXLive::TLUtils::SshURIRegex,) {
$media = 'NET';
} else {
if ($rootpath =~ m,file://*(.*)$,) {