From 0ec123477e9ec513733422a135b5ddb98a7a1444 Mon Sep 17 00:00:00 2001
From: David Aizenberg <david@aizenberg.co.uk>
Date: Mon, 13 Jun 2022 16:30:40 +0100
Subject: [PATCH] small tweaks

---
 .bashrc  |  9 +++++++--
 setup.sh | 10 +++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.bashrc b/.bashrc
index ac68a41..fada3be 100644
--- a/.bashrc
+++ b/.bashrc
@@ -11,7 +11,12 @@ EDITOR=vim
 
 
 getCurrentSKMKey() {
-  skm ls | grep -e '->' | awk '{print $2}'
+    if ! command -v skm &> /dev/null
+    then
+     echo "none"
+    else
+        skm ls | grep -e '->' | awk '{print $2}'
+    fi
 }
 
 export PS1='`date +'%H:%M'`:[\h]|\e[00;33m\]🔑`getCurrentSKMKey`\e[00;0m\]|`pwd` \n\[\e[00;32m\]\u\[\e[0m\]\[\e[00;37m\]$ '
@@ -93,7 +98,7 @@ if [ -f /etc/bash_completion ]; then
  . /etc/bash_completion
 fi
 
-export PY_USER_BIN=$(python -c 'import site; print(site.USER_BASE + "/bin")')
+export PY_USER_BIN=$(python3 -c 'import site; print(site.USER_BASE + "/bin")')
 export PATH=$PY_USER_BIN:$PATH
 
 export NVM_DIR="$HOME/.nvm"
diff --git a/setup.sh b/setup.sh
index 4846e7b..3ce6293 100755
--- a/setup.sh
+++ b/setup.sh
@@ -7,7 +7,7 @@ read -p "Install dependencies? [Ubuntu only]" -n 1 -r
 echo    
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
-    sudo apt install curl vim silversearcher-ag nmap neofetch gdebi git ranger tig mycli pgcli fzf jq miller newsboat
+    sudo apt install curl vim silversearcher-ag nmap neofetch git ranger tig mycli fzf jq miller newsboat
 fi
 
 read -p "Delete old backups? " -n 1 -r
@@ -70,10 +70,10 @@ ln -rsf .vimrc ~/.vimrc
 #git clone https://github.com/neoclide/coc.nvim ~/.vim/pack/plugins/start/coc.nvim
 #cd ~/.vim/pack/plugins/start/coc.nvim && ./install.sh && yarn install --frozen-lockfile
 
-echo -e "${GREEN} Installing Pathogen ${RESET}"
+echo -e "${GREEN} Vundle ${RESET}"
 
 mkdir -p ~/.vim/autoload ~/.vim/bundle && \
-curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
+git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
 mkdir -p ~/.vim/plugin
 git clone git://github.com/mattn/calendar-vim ~/.vim/bundle/calendar-vim
@@ -87,10 +87,6 @@ echo -e "${GREEN} Please run :helptags on first run ${RESET}"
 git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline &> /dev/null
 git clone git://github.com/digitaltoad/vim-pug.git &> /dev/null
 
-echo -e "${GREEN} Vundle ${RESET}"
-
-git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-
 echo -e "${GREEN} mustang colour theme ${RESET}" 
 mkdir -p tmp/
 git clone https://github.com/croaker/mustang-vim tmp/mustang &> /dev/null