adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime(netrw): prefer scp over pscp

Browse Source 
regression introduced in ce2ad9ffd7

The current logic is a bit funny, in that it checks for an executable of
scp, then pscp and if neither exists, it uses: scp :/
Anyway, let's fall back to the logic used before the above commit.

related: #14739

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-05-13 20:56:43 +02:00
parent b7258738f8
commit 43f2edc096
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/autoload/netrw.vim
View File

@ -12,6 +12,7 @@
" 2024 May 08 by Vim Project: cleanup legacy Win9X checks " 2024 May 08 by Vim Project: cleanup legacy Win9X checks
" 2024 May 09 by Vim Project: remove hard-coded private.ppk " 2024 May 09 by Vim Project: remove hard-coded private.ppk
" 2024 May 10 by Vim Project: recursively delete directories by default " 2024 May 10 by Vim Project: recursively delete directories by default
" 2024 May 13 by Vim Project: prefer scp over pscp
" Former Maintainer: Charles E Campbell " Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1
@ -283,13 +284,14 @@ call s:NetrwInit("g:netrw_rcp_cmd" , "rcp")
call s:NetrwInit("g:netrw_rsync_cmd", "rsync") call s:NetrwInit("g:netrw_rsync_cmd", "rsync")
call s:NetrwInit("g:netrw_rsync_sep", "/") call s:NetrwInit("g:netrw_rsync_sep", "/")
if !exists("g:netrw_scp_cmd") if !exists("g:netrw_scp_cmd")
if executable("pscp") if executable("scp")
call s:NetrwInit("g:netrw_scp_cmd" , "scp -q")
elseif executable("pscp")
call s:NetrwInit("g:netrw_scp_cmd", 'pscp -q') call s:NetrwInit("g:netrw_scp_cmd", 'pscp -q')
else else
call s:NetrwInit("g:netrw_scp_cmd" , "scp -q") call s:NetrwInit("g:netrw_scp_cmd" , "scp -q")
endif endif
endif endif
call s:NetrwInit("g:netrw_sftp_cmd" , "sftp") call s:NetrwInit("g:netrw_sftp_cmd" , "sftp")
call s:NetrwInit("g:netrw_ssh_cmd" , "ssh") call s:NetrwInit("g:netrw_ssh_cmd" , "ssh")