unify shell path setting, fix mac beta version bug

This commit is contained in:
Jiawei Li 2018-06-29 16:54:08 +08:00
parent 0a73e1c1df
commit 2c46e5c382
2 changed files with 8 additions and 17 deletions

View File

@ -13,15 +13,3 @@ for fpath in split(globpath(vimsettings, '*.vim'), '\n')
exe 'source' fpath exe 'source' fpath
endfor endfor
if has("unix")
let s:uname = system("uname -s")
if s:uname == "Darwin"
set shell=/usr/local/bin/zsh
else
set shell=/usr/bin/zsh
endif
endif

View File

@ -1,9 +1,12 @@
" Set the shell to bash so we inherit its path, to make sure " Set the shell to bash so we inherit its path, to make sure
" we inherit its path. This affects :Rtags finding the right " we inherit its path. This affects :Rtags finding the right
" path to homebrewed ctags rather than the XCode version of ctags " path to homebrewed ctags rather than the XCode version of ctags
if has('win32') if has("unix")
elseif has('mac') let s:uname = system("uname -s")
set shell=/usr/local/bin/zsh\ -l if s:uname =~ "Darwin"
elseif has('unix') set shell=/usr/local/bin/zsh
set shell=/usr/bin/zsh\ -l else
set shell=/usr/bin/zsh
endif
elseif has('win32')
endif endif