From 49168cdc8f61ed7373237f92d0e7a1ec33af3abc Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 2 Nov 2015 15:52:36 -0500 Subject: [PATCH] neovim: Handle new xdg system config file --- packages/neovim/build.sh | 4 +++- packages/neovim/{nvimrc => init.vim} | 1 - packages/neovim/src-nvim-os-stdpaths.c.patch | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) rename packages/neovim/{nvimrc => init.vim} (94%) create mode 100644 packages/neovim/src-nvim-os-stdpaths.c.patch diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh index 53c037ecf..3fd09d304 100644 --- a/packages/neovim/build.sh +++ b/packages/neovim/build.sh @@ -38,5 +38,7 @@ termux_step_configure () { } termux_step_post_make_install () { - cp $TERMUX_PKG_BUILDER_DIR/nvimrc $TERMUX_PREFIX/share/nvim/nvimrc + local _CONFIG_DIR=$TERMUX_PREFIX/etc/xdg/nvim + mkdir -p $_CONFIG_DIR + cp $TERMUX_PKG_BUILDER_DIR/init.vim $_CONFIG_DIR/ } diff --git a/packages/neovim/nvimrc b/packages/neovim/init.vim similarity index 94% rename from packages/neovim/nvimrc rename to packages/neovim/init.vim index 5e53c1341..efc879baa 100644 --- a/packages/neovim/nvimrc +++ b/packages/neovim/init.vim @@ -1,7 +1,6 @@ set autowrite set ignorecase set smartcase -set smartindent set title syntax on diff --git a/packages/neovim/src-nvim-os-stdpaths.c.patch b/packages/neovim/src-nvim-os-stdpaths.c.patch new file mode 100644 index 000000000..ff890842c --- /dev/null +++ b/packages/neovim/src-nvim-os-stdpaths.c.patch @@ -0,0 +1,14 @@ +diff -u -r ../neovim-master/src/nvim/os/stdpaths.c ./src/nvim/os/stdpaths.c +--- ../neovim-master/src/nvim/os/stdpaths.c 2015-11-01 16:16:38.000000000 -0500 ++++ ./src/nvim/os/stdpaths.c 2015-11-02 14:12:12.770172673 -0500 +@@ -34,8 +34,8 @@ + [kXDGDataHome] = "~/.local/share", + [kXDGCacheHome] = "~/.cache", + [kXDGRuntimeDir] = NULL, +- [kXDGConfigDirs] = "/etc/xdg/", +- [kXDGDataDirs] = "/usr/local/share/:/usr/share/", ++ [kXDGConfigDirs] = "@TERMUX_PREFIX@/etc/xdg/", ++ [kXDGDataDirs] = "@TERMUX_PREFIX@/usr/local/share/:@TERMUX_PREFIX@/usr/share/", + #endif + }; +