From a4aa9207d70525802021408f068a6b49ba973343 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sat, 21 Aug 2021 16:31:45 +0200
Subject: [PATCH 1/2] 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

From 1318ac21dc1986c44f92d14210ed607288c6bcba Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Wed, 25 Aug 2021 21:43:03 +1000
Subject: [PATCH 2/2] Update joplin to 2.3.5

---
 win32_install.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win32_install.bat b/win32_install.bat
index 04f635c..f914b16 100644
--- a/win32_install.bat
+++ b/win32_install.bat
@@ -190,8 +190,8 @@ REM ----------------------------------------------------------------------------
 REM Joplin
 REM ----------------------------------------------------------------------------
 if !install_joplin! == 1 (
-    set joplin_sha256=1048da869657a889e27fc6c320161b806cc6e48de2d0ddaa602e92c6734f1c8c
-    set joplin_version=2.1.9
+    set joplin_sha256=719c949839fc489eb8a94a0489ea4f0948b8c9857f20ee26f7e94272a39c600d
+    set joplin_version=2.3.5
 
     set joplin_dir=!tools_dir!\joplin-x64-!joplin_version!
     set joplin_exe=!joplin_dir!\JoplinPortable.exe