From a4aa9207d70525802021408f068a6b49ba973343 Mon Sep 17 00:00:00 2001 From: doyle Date: Sat, 21 Aug 2021 16:31:45 +0200 Subject: [PATCH] Fix bugs in linux deploy script --- linux_install.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/linux_install.sh b/linux_install.sh index 8fad734..7fe6e5e 100755 --- a/linux_install.sh +++ b/linux_install.sh @@ -1,9 +1,13 @@ -if [[ ! -f "${HOME}/.vim/autoload/plug.vim" ]]; then - wget --directory-prefix=../.vim/autoload https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +vim_dir=${HOME}/.vim +vim_plug_dir=${vim_dir}/autoload +mkdir --parents ${vim_plug_dir} + +if [[ ! -f "${vim_plug_dir}/plug.vim" ]]; then + wget --directory-prefix=${vim_plug_dir} https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim fi -if [[ ! -f "${HOME}/clang-format.py" ]]; then - wget --directory-prefix=${HOME}/.vim/clang-format.py https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format.py +if [[ ! -f "${vim_dir}/clang-format.py" ]]; then + wget --directory-prefix=${vim_dir} https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format.py fi # @@ -14,6 +18,8 @@ sudo apt install exuberant-ctags neovim clang-format ripgrep # # NVim # +mkdir --parents ~/.config/nvim + cp --force Installer/_vimrc ~/.vimrc cp --force Installer/unix_nvim_init.vim ~/.config/nvim/init.vim cp --force Installer/clang-format-style-file ~/_clang-format