From 512758c29985cfcc5ec980daf04e0f0b2ed8dc81 Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Tue, 21 Apr 2020 15:27:47 -0700 Subject: [PATCH] fix deoplete-jedi-git for vim (or neovim) --- deoplete-jedi-git/.SRCINFO | 2 +- deoplete-jedi-git/PKGBUILD | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deoplete-jedi-git/.SRCINFO b/deoplete-jedi-git/.SRCINFO index fd048a1..d15ff88 100644 --- a/deoplete-jedi-git/.SRCINFO +++ b/deoplete-jedi-git/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = deoplete-jedi-git pkgdesc = jedi add-on for deoplete completion plugin for neovim pkgver = r381.42f4c24 - pkgrel = 2 + pkgrel = 3 url = https://github.com/deoplete-plugins/deoplete-jedi arch = any license = MIT diff --git a/deoplete-jedi-git/PKGBUILD b/deoplete-jedi-git/PKGBUILD index c96ec1a..937bb3c 100644 --- a/deoplete-jedi-git/PKGBUILD +++ b/deoplete-jedi-git/PKGBUILD @@ -3,6 +3,8 @@ ########################################################################################################### # Build Options ########################################################################################################### +# seems to work for both vim or neovim if you install for vim, +# but doesn't work for vim if you only install for neovim _vim="y" _use_system_jedi="y" _neovim="n" @@ -11,7 +13,7 @@ _neovim="n" _name='deoplete-jedi' pkgname="${_name}-git" pkgver=r381.42f4c24 -pkgrel=2 +pkgrel=3 pkgdesc="jedi add-on for deoplete completion plugin for neovim" arch=('any') url="https://github.com/deoplete-plugins/deoplete-jedi" @@ -101,20 +103,20 @@ package() { if [ "$_vim" = "y" ]; then if [[ "$_use_system_jedi" == "n" ]]; then - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi" - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso" + mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi" + mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/parso" cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/parso/parso" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/parso/" + "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/parso/" cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/" + "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi/" cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/"{stdlib,third_party} \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" + "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/vendored/jedi/jedi/third_party/typeshed/" fi if [[ "$_use_system_jedi" == "y" ]]; then - mkdir -p "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete" + mkdir -p "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete" fi cp -r "${srcdir}/${_name}/rplugin/python3/deoplete/sources" \ - "$pkgdir/usr/share/nvim/runtime/rplugin/python3/deoplete/" + "$pkgdir/usr/share/vim/vimfiles/rplugin/python3/deoplete/" fi install -D -m644 "${srcdir}/${_name}/README.md" "$pkgdir"/usr/share/doc/$pkgname/README.md