From bd11228f783f079562ac57ba2b057cc22313eca2 Mon Sep 17 00:00:00 2001
From: J H Hodrien <J.H.Hodrien@leeds.ac.uk>
Date: Thu, 23 Feb 2023 14:10:48 +0000
Subject: [PATCH] Tidy and work correctly with pip or pip3

- Use either pip3 or pip as available
- Tweaks the python3 test to work correctly
- Adjust two other commands to allow you to run this more than once without
  generating errors.
- Make the install script executable so we don't have to run bash separately.

I was using this with Anaconda which only provides pip, not pip3.
---
 install.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 install.sh

diff --git a/install.sh b/install.sh
old mode 100644
new mode 100755
index 1c44ba7..58c3f8d
--- a/install.sh
+++ b/install.sh
@@ -11,20 +11,25 @@ if [[ ! -f "configs/$1.yaml" ]];then
     exit 1
 fi
 
-if [[  $( which python3 &> /dev/null ) ]];then
+if ! which python3 &> /dev/null;then
     echo "Could not find python3"
     exit 1 
 fi
-if [[  $(which pip3 &> /dev/null ) ]];then
-    echo "Could not find pip3"
+if which pip3 &> /dev/null;then
+    PIP=pip3
+elif which pip &> /dev/null;then
+    PIP=pip
+else
+    echo "Could not find pip3 or pip"
     exit 1 
 fi
-mkdir default_config
-ln -s ../configs/$1.yaml default_config/config.yaml
+
+mkdir -p default_config
+ln -sf ../configs/$1.yaml default_config/config.yaml
 echo "Using python3: $(which python3)"
 unset PYTHONUSERBASE
 export PYTHONUSERBASE=PyDeps
 echo "export PY_EXE=$(which python3)" > frontends/inst_vars.sh
-echo "Installing pyyaml"
-pip3 install --user pyyaml
+echo "Installing pyyaml with $PIP"
+$PIP install --user pyyaml