From 9e41c52c8048416cf4682aeae1d1a61ad272be5d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 18 Jan 2023 10:15:19 +0000
Subject: [PATCH] Add pypoetry config, add oh-my-zsh install check before
 installer

---
 config/pypoetry/config.toml | 2 ++
 install.sh                  | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 config/pypoetry/config.toml

diff --git a/config/pypoetry/config.toml b/config/pypoetry/config.toml
new file mode 100644
index 00000000..ab1033bd
--- /dev/null
+++ b/config/pypoetry/config.toml
@@ -0,0 +1,2 @@
+[virtualenvs]
+in-project = true
diff --git a/install.sh b/install.sh
index 983184aa..ac508e4b 100755
--- a/install.sh
+++ b/install.sh
@@ -17,7 +17,7 @@ git_clone_if_missing () {
     then
         git clone --depth 1 "$1" "$2"
     else
-        echo "$1 already checked out -> $2"
+        echo "$1 already checked out: $2"
     fi
 }
 
@@ -46,7 +46,12 @@ PACKER_DIR="$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim"
 git_clone_if_missing "$PACKER_REPO" "$PACKER_DIR"
 
 # oh-my-zsh
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+if [ ! -d "$ZSH" ]
+then
+    sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+else
+    echo "oh-my-zsh already installed: $ZSH"
+fi
 OHMYZSH_DIR="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}"
 if [ -d "$OHMYZSH_DIR" ]
 then