Merge branch 'master' of github.com:doy-lee/doy-lee into master

This commit is contained in:
doyle 2021-08-31 20:00:23 +10:00
commit a3ad610cb6
2 changed files with 12 additions and 6 deletions

View File

@ -1,9 +1,13 @@
if [[ ! -f "${HOME}/.vim/autoload/plug.vim" ]]; then vim_dir=${HOME}/.vim
wget --directory-prefix=../.vim/autoload https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.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 fi
if [[ ! -f "${HOME}/clang-format.py" ]]; then if [[ ! -f "${vim_dir}/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 wget --directory-prefix=${vim_dir} https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format.py
fi fi
# #
@ -14,6 +18,8 @@ sudo apt install exuberant-ctags neovim clang-format ripgrep
# #
# NVim # NVim
# #
mkdir --parents ~/.config/nvim
cp --force Installer/_vimrc ~/.vimrc cp --force Installer/_vimrc ~/.vimrc
cp --force Installer/unix_nvim_init.vim ~/.config/nvim/init.vim cp --force Installer/unix_nvim_init.vim ~/.config/nvim/init.vim
cp --force Installer/clang-format-style-file ~/_clang-format cp --force Installer/clang-format-style-file ~/_clang-format

View File

@ -190,8 +190,8 @@ REM ----------------------------------------------------------------------------
REM Joplin REM Joplin
REM ---------------------------------------------------------------------------- REM ----------------------------------------------------------------------------
if !install_joplin! == 1 ( if !install_joplin! == 1 (
set joplin_sha256=1048da869657a889e27fc6c320161b806cc6e48de2d0ddaa602e92c6734f1c8c set joplin_sha256=719c949839fc489eb8a94a0489ea4f0948b8c9857f20ee26f7e94272a39c600d
set joplin_version=2.1.9 set joplin_version=2.3.5
set joplin_dir=!tools_dir!\joplin-x64-!joplin_version! set joplin_dir=!tools_dir!\joplin-x64-!joplin_version!
set joplin_exe=!joplin_dir!\JoplinPortable.exe set joplin_exe=!joplin_dir!\JoplinPortable.exe