From b52ba5d051d518e80057a03f35d3c4f601e23c8a Mon Sep 17 00:00:00 2001
From: Theodore Papamarkou <theodore.papamarkou@gmail.com>
Date: Sun, 6 Dec 2020 06:59:51 +0200
Subject: [PATCH] Nearly completed new tag, clean install

---
 installation/dev.sh     |  2 --
 installation/gdev.sh    | 10 ++++------
 installation/gstable.sh |  4 ++--
 installation/stable.sh  |  4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/installation/dev.sh b/installation/dev.sh
index 80c1ccd..94a7841 100755
--- a/installation/dev.sh
+++ b/installation/dev.sh
@@ -26,8 +26,6 @@ $CONDABIN create -n $PKGNAME -y python=$PYVERSION
 $CONDABIN init $(basename $SHELL)
 $CONDABIN config --set auto_activate_base false
 
-source $HOME/.bashrc
-
 mkdir -p $PYPKGDIR
 git -C $PYPKGDIR clone $PKGURL
 $CONDABIN run -p $CONDAENV pip install -e $PYPKGDIR/$PKGNAME -r $PKGDEVREQS
diff --git a/installation/gdev.sh b/installation/gdev.sh
index d0b1f21..11b3374 100755
--- a/installation/gdev.sh
+++ b/installation/gdev.sh
@@ -32,10 +32,8 @@ su - $METAUSER -c "mkdir -p $BINDIR"
 su - $METAUSER -c "ln -s $CONDABIN $BINDIR"
 su - $METAUSER -c "echo \"export PATH=$BINDIR:$PATH\" >> $BASEDIR/.bashrc"
 
-su - $METAUSER -c "mkdir -p $PYPKGDIR;
-cd $PYPKGDIR;
-git clone $PKGURL;
-cd $PKGNAME;
-$CONDABIN run -p $CONDAENV python setup.py develop --user"
+su - $METAUSER -c "mkdir -p $PYPKGDIR"
+su - $METAUSER -c "git -C $PYPKGDIR clone $PKGURL"
+su - $METAUSER -c "$CONDABIN run -p $CONDAENV pip install -e $PYPKGDIR/$PKGNAME -r $PKGDEVREQS"
 
-rm $CONDASCRIPT
+su - $METAUSER -c "rm $BASEDIR/$CONDASCRIPT"
diff --git a/installation/gstable.sh b/installation/gstable.sh
index 30cd5ab..72db859 100755
--- a/installation/gstable.sh
+++ b/installation/gstable.sh
@@ -6,7 +6,7 @@ export METAUSER='theodore'
 export BASEDIR="/home/$METAUSER"
 export BINDIR="$BASEDIR/bin"
 export PKGNAME='eeyore'
-export PYVERSION='3.6'
+export PYVERSION='3.7'
 export CONDADIR="$BASEDIR/opt/continuum/miniconda/miniconda3"
 export CONDABIN="$CONDADIR/bin/conda"
 export CONDASCRIPT='Miniconda3-latest-Linux-x86_64.sh'
@@ -29,4 +29,4 @@ su - $METAUSER -c "mkdir -p $BINDIR"
 su - $METAUSER -c "ln -s $CONDABIN $BINDIR"
 su - $METAUSER -c "echo \"export PATH=$BINDIR:$PATH\" >> $BASEDIR/.bashrc"
 
-su - $METAUSER -c "rm $CONDASCRIPT"
+su - $METAUSER -c "rm $BASEDIR/$CONDASCRIPT"
diff --git a/installation/stable.sh b/installation/stable.sh
index 4f37282..f45e20d 100755
--- a/installation/stable.sh
+++ b/installation/stable.sh
@@ -3,7 +3,7 @@
 # Start up script for setting up environment on Ubuntu 20.04 LTS
 
 export PKGNAME='eeyore'
-export PYVERSION='3.6'
+export PYVERSION='3.7'
 export CONDADIR="$HOME/opt/continuum/miniconda/miniconda3"
 export CONDABIN="$CONDADIR/bin/conda"
 export CONDASCRIPT='Miniconda3-latest-Linux-x86_64.sh'
@@ -22,4 +22,4 @@ $CONDABIN create -n $PKGNAME -y -c papamarkou -c pytorch -c conda-forge python=$
 $CONDABIN init $(basename $SHELL)
 $CONDABIN config --set auto_activate_base false
 
-rm $CONDASCRIPT
+rm $HOME/$CONDASCRIPT