From bbc802c566db6307101f8e5ee6776d381b5cca3c Mon Sep 17 00:00:00 2001
From: Christian Panhuber <Christian.Panhuber@bmw.de>
Date: Thu, 1 Oct 2020 13:00:06 +0200
Subject: [PATCH 1/2] Fixes for 20.04

---
 bootstrap | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bootstrap b/bootstrap
index 7c440c78532..0bb139b35f1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -82,7 +82,7 @@ function ensure_dotfiles() {
 
     echo "Do you want to copy the dotfiles to your home reposory?"
     echo "(This may overwrite some files) Are you sure? (y/[n]) ";
-    read -rn reply
+    read -r reply
     if [[ ${reply} =~ ^[YyZz]$ ]]; then
         rsync --exclude '.git/' \
             --exclude 'bootstrap' \
@@ -121,13 +121,13 @@ function ensure_vim_configuration() {
         sudo apt-get -qq remove vim-tiny
     fi
 
-    if is_installed vim-gnome; then
+    if is_installed vim-gtk3; then
         echo 'vim gnome already installed. Updating vim'
         sudo apt-get update -qq
-        sudo apt-get install --only-upgrade -qq -y vim-gnome
+        sudo apt-get install --only-upgrade -qq -y vim-gtk3
     else
         echo 'Installing vim (huge config)'
-        sudo apt-get install -qq vim-gnome
+        sudo apt-get install -qq vim-gtk3
     fi
     vim +PlugInstall +PlugUpdate +PlugUpgrade +qall
 }
@@ -201,9 +201,8 @@ function ensure_packages() {
         jq
         meld
         nmon
-        python-autopep8
-        python-dev
-        python-yapf
+        python3-autopep8
+        python3-yapf
         python3-dev
         rsync
         shellcheck

From 667f8219576132c34123597498f9ae82a80821d7 Mon Sep 17 00:00:00 2001
From: Christian Panhuber <Christian.Panhuber@bmw.de>
Date: Thu, 1 Oct 2020 16:51:00 +0200
Subject: [PATCH 2/2] Escape character for backslash key

---
 .tmux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.tmux.conf b/.tmux.conf
index 4e91479a94f..ac60fe8dff1 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -68,7 +68,7 @@ bind-key -n C-h if-shell "$is_vim" "send-keys C-h"  "select-pane -L"
 bind-key -n C-j if-shell "$is_vim" "send-keys C-j"  "select-pane -D"
 bind-key -n C-k if-shell "$is_vim" "send-keys C-k"  "select-pane -U"
 bind-key -n C-l if-shell "$is_vim" "send-keys C-l"  "select-pane -R"
-bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
+bind-key -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
 
 # alt-vim keys to resize panel without prefix
 bind -n M-h resize-pane -L 10