Browse Source

Added a condition to check for when assigning cmd to execute.

pull/349/head
forethinker 12 years ago
parent
commit
eb7a43b1e6
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      autoload/vundle/installer.vim

+ 3
- 3
autoload/vundle/installer.vim View File

@ -169,7 +169,7 @@ endf
func! vundle#installer#delete(bang, dir_name) abort
let cmd = (has('win32') || has('win64')) ?
let cmd = ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh'))) ?
\ 'rmdir /S /Q' :
\ 'rm -rf'
@ -251,7 +251,7 @@ func! s:sync(bang, bundle) abort
endf
func! g:shellesc(cmd) abort
if (has('win32') || has('win64'))
if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
if &shellxquote != '(' " workaround for patch #445
return '"'.a:cmd.'"' " enclose in quotes so && joined cmds work
endif
@ -260,7 +260,7 @@ func! g:shellesc(cmd) abort
endf
func! g:shellesc_cd(cmd) abort
if (has('win32') || has('win64'))
if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
let cmd = substitute(a:cmd, '^cd ','cd /d ','') " add /d switch to change drives
let cmd = g:shellesc(cmd)
return cmd


Loading…
Cancel
Save