diff options
author | Norbert Preining <preining@logic.at> | 2018-05-24 03:08:27 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2018-05-24 03:08:27 +0000 |
commit | 7895df6ab5d011bd09484b5aba16db682a2621e9 (patch) | |
tree | aa6e25725d18fece2089cfba8fd2eec378d59fca /Master/texmf-dist | |
parent | d73f728b5ea3ef4a3a8fd60ba9a264bded6dd5ad (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/texmf-dist')
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 7431ebcb69c..8ee5ee58b33 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -4434,9 +4434,9 @@ sub action_repository { return ($F_ERROR); } # check if it is either url or absolute path - if (($p !~ m!^(https?|ftp)://!i) && + if (($p !~ m!^(https?|ftp)://!i) && ($p !~ m!$TeXLive::TLUtils::SshURIRegex!) && !File::Spec->file_name_is_absolute($p)) { - tlwarn("$prg: neither https?/ftp URL nor absolute path, no action: $p\n"); + tlwarn("$prg: neither https?/ftp/ssh/scp/file URI nor absolute path, no action: $p\n"); return ($F_ERROR); } my $t = shift @ARGV; @@ -6550,7 +6550,8 @@ 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!^(https?|ftp)://!i || + if (! ( $location =~ m!^(https?|ftp)://!i || + $location =~ m!$TeXLive::TLUtils::SshURIRegex!i || (win32() && (!(-e $location) || ($location =~ m!^.:[\\/]!) ) ) ) ) { # seems to be a local path, try to normalize it my $testloc = abs_path($location); |