kevin/vim-plug
1
Fork 0
mirror of https://github.com/junegunn/vim-plug.git synced 2024-12-19 10:35:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix job_start with spaces in path in Windows (#588)

Browse Source 
Close #586 
Close #565
This commit is contained in:
Nikita Slepogin 2017-01-31 15:19:48 +03:00 committed by Junegunn Choi
parent 5e6bd469ac
commit 359a65230e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plug.vim
View File

@ -1143,9 +1143,6 @@ endfunction
function! s:job_exit_cb(self, data) abort function! s:job_exit_cb(self, data) abort
let a:self.running = 0 let a:self.running = 0
let a:self.error = a:data != 0 let a:self.error = a:data != 0
if has_key(a:self, 'tempname')
call delete(a:self.tempname)
endif
call s:reap(a:self.name) call s:reap(a:self.name)
call s:tick() call s:tick()
endfunction endfunction
@ -1167,8 +1164,8 @@ function! s:spawn(name, cmd, opts)
let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
\ 'new': get(a:opts, 'new', 0) } \ 'new': get(a:opts, 'new', 0) }
let s:jobs[a:name] = job let s:jobs[a:name] = job
let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'],
let argv = s:is_win ? cmd : ['sh', '-c', cmd] \ has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd)
if s:nvim if s:nvim
call extend(job, { call extend(job, {
@ -1185,12 +1182,7 @@ function! s:spawn(name, cmd, opts)
\ 'Invalid arguments (or job table is full)'] \ 'Invalid arguments (or job table is full)']
endif endif
elseif s:vim8 elseif s:vim8
if s:is_win let jid = job_start(s:is_win ? join(argv, ' ') : argv, {
let job.tempname = tempname().'.bat'
call writefile([argv], job.tempname)
let argv = job.tempname
endif
let jid = job_start(argv, {
\ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]),
\ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]),
\ 'out_mode': 'raw' \ 'out_mode': 'raw'