Github/vim-plug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support paths with spaces (#15 [, #14])

Browse Source
This commit is contained in:
Junegunn Choi 2014-03-27 01:07:02 +09:00
parent c827d2fa05
commit 358363eefc
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plug.vim
View File

@ -144,10 +144,14 @@ function! s:rtp(spec)
return rtp return rtp
endfunction endfunction
function! s:esc(path)
return substitute(a:path, ' ', '\\ ', 'g')
endfunction
function! s:add_rtp(rtp) function! s:add_rtp(rtp)
execute "set rtp^=".a:rtp execute "set rtp^=".s:esc(a:rtp)
if isdirectory(a:rtp.'after') if isdirectory(a:rtp.'after')
execute "set rtp+=".a:rtp.'after' execute "set rtp+=".s:esc(a:rtp.'after')
endif endif
endfunction endfunction
@ -330,7 +334,7 @@ function! s:extend(names)
for name in a:names for name in a:names
let plugfile = s:rtp(g:plugs[name]) . s:plug_file let plugfile = s:rtp(g:plugs[name]) . s:plug_file
if filereadable(plugfile) if filereadable(plugfile)
execute "source ". plugfile execute "source ". s:esc(plugfile)
endif endif
endfor endfor
finally finally
@ -359,13 +363,13 @@ function! s:update_serial(pull)
for [name, spec] in items(todo) for [name, spec] in items(todo)
let done[name] = 1 let done[name] = 1
if isdirectory(spec.dir) if isdirectory(spec.dir)
execute 'cd '.spec.dir execute 'cd '.s:esc(spec.dir)
let [valid, msg] = s:git_valid(spec, 0, 0) let [valid, msg] = s:git_valid(spec, 0, 0)
if valid if valid
let result = a:pull ? let result = a:pull ?
\ s:system( \ s:system(
\ printf('git checkout -q %s 2>&1 && git pull origin %s 2>&1', \ printf('git checkout -q %s 2>&1 && git pull origin %s 2>&1',
\ spec.branch, spec.branch)) : 'Already installed' \ s:shellesc(spec.branch), s:shellesc(spec.branch))) : 'Already installed'
let error = a:pull ? v:shell_error != 0 : 0 let error = a:pull ? v:shell_error != 0 : 0
else else
let result = msg let result = msg
@ -403,6 +407,10 @@ endfunction
function! s:update_parallel(pull, threads) function! s:update_parallel(pull, threads)
ruby << EOF ruby << EOF
def esc arg
%["#{arg.gsub('"', '\"')}"]
end
st = Time.now st = Time.now
require 'thread' require 'thread'
require 'fileutils' require 'fileutils'
@ -503,8 +511,10 @@ function! s:update_parallel(pull, threads)
while pair = take1.call while pair = take1.call
name = pair.first name = pair.first
dir, uri, branch = pair.last.values_at *%w[dir uri branch] dir, uri, branch = pair.last.values_at *%w[dir uri branch]
branch = esc branch
ok, result = ok, result =
if File.directory? dir if File.directory? dir
dir = esc dir
ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url" ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url"
current_uri = data.lines.to_a.last current_uri = data.lines.to_a.last
if !ret if !ret
@ -526,7 +536,7 @@ function! s:update_parallel(pull, threads)
end end
else else
FileUtils.mkdir_p(base) FileUtils.mkdir_p(base)
d = dir.sub(%r{[\\/]+$}, '') d = esc dir.sub(%r{[\\/]+$}, '')
bt.call "#{cd} #{base} && git clone --recursive #{uri} -b #{branch} #{d} 2>&1" bt.call "#{cd} #{base} && git clone --recursive #{uri} -b #{branch} #{d} 2>&1"
end end
log.call name, result, ok log.call name, result, ok
@ -593,7 +603,7 @@ function! s:git_valid(spec, check_branch, cd)
let ret = 1 let ret = 1
let msg = 'OK' let msg = 'OK'
if isdirectory(a:spec.dir) if isdirectory(a:spec.dir)
if a:cd | execute "cd " . a:spec.dir | endif if a:cd | execute "cd " . s:esc(a:spec.dir) | endif
let result = split(s:system("git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url"), '\n') let result = split(s:system("git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url"), '\n')
let remote = result[-1] let remote = result[-1]
if v:shell_error != 0 if v:shell_error != 0
@ -666,7 +676,7 @@ function! s:clean(force)
if yes if yes
for dir in todo for dir in todo
if isdirectory(dir) if isdirectory(dir)
call system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . dir) call system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(dir))
endif endif
endfor endfor
call append(line('$'), 'Removed.') call append(line('$'), 'Removed.')