Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows support for Unix shells and powershell #860

Merged
merged 11 commits into from
Aug 16, 2019
Merged

Fix Windows support for Unix shells and powershell #860

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8754b3e
Use cmd.exe shellescape inside batchfile
janlazo Jul 23, 2019
41a4926
Vim job execs batchfile via cmd.exe
janlazo Jul 23, 2019
e5c6dbe
Revert expand and s:spawn changes
janlazo Aug 3, 2019
9382063
batchfile is not required in s:spawn
janlazo Aug 3, 2019
35cfe4b
Support powershell
janlazo Aug 3, 2019
bb12f79
Use powershell '&' to run escaped batchfile
janlazo Aug 3, 2019
91a643c
Add s:batchfile() for creating batchfiles
janlazo Aug 4, 2019
b7507c2
Support non-batchfile shellescape for cmd.exe
janlazo Aug 4, 2019
b8d4952
Use 'elseif' to reduce code
janlazo Aug 10, 2019
ebc1690
Add plug#shellescape
janlazo Aug 10, 2019
c0e21be
Support 7.4.52
janlazo Aug 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions plug.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ function! s:bang(cmd, ...)
if s:is_win
let batchfile = tempname().'.bat'
call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = s:shellesc(expand(batchfile))
let cmd = s:shellesc(expand(batchfile), &shell)
endif
let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
execute "normal! :execute g:_plug_bang\<cr>\<cr>"
Expand Down Expand Up @@ -1208,7 +1208,7 @@ function! s:spawn(name, cmd, opts)
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
if !empty(job.batchfile)
call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
let cmd = s:shellesc(expand(job.batchfile))
let cmd = s:shellesc(expand(job.batchfile), &shell)
janlazo marked this conversation as resolved.
Show resolved Hide resolved
endif
let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)

Expand Down Expand Up @@ -1988,8 +1988,9 @@ function! s:shellesc_cmd(arg)
return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
endfunction

function! s:shellesc(arg)
if &shell =~# 'cmd.exe$'
function! s:shellesc(arg, ...)
janlazo marked this conversation as resolved.
Show resolved Hide resolved
let shell = get(a:000, 0, s:is_win ? 'cmd.exe' : 'sh')
janlazo marked this conversation as resolved.
Show resolved Hide resolved
if shell =~# 'cmd.exe$'
return s:shellesc_cmd(a:arg)
endif
return shellescape(a:arg)
Expand Down Expand Up @@ -2035,7 +2036,7 @@ function! s:system(cmd, ...)
if s:is_win
let batchfile = tempname().'.bat'
call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = s:shellesc(expand(batchfile))
let cmd = s:shellesc(expand(batchfile), &shell)
endif
return system(cmd)
finally
Expand Down Expand Up @@ -2369,7 +2370,7 @@ function! s:preview_commit()
if s:is_win
let batchfile = tempname().'.bat'
call writefile(["@echo off\r", cmd . "\r"], batchfile)
let cmd = expand(batchfile)
let cmd = s:shellesc(expand(batchfile), &shell)
endif
execute 'silent %!' cmd
finally
Expand Down