From 996e5217d2224804be6d71ca29af941c6fe3a3ef Mon Sep 17 00:00:00 2001
From: mrq <barry.quiggles@protonmail.com>
Date: Sat, 18 Feb 2023 16:20:26 +0000
Subject: [PATCH] apparently anything after deactivate does not get ran, as it
 terminates the batch script.

---
 setup-cuda.bat                           | 2 +-
 setup-directml.bat                       | 2 +-
 setup_training.bat => setup-training.bat | 2 +-
 update.bat                               | 3 ++-
 update.sh                                | 5 +++--
 5 files changed, 8 insertions(+), 6 deletions(-)
 rename setup_training.bat => setup-training.bat (52%)

diff --git a/setup-cuda.bat b/setup-cuda.bat
index bb0a17c..9453d3e 100755
--- a/setup-cuda.bat
+++ b/setup-cuda.bat
@@ -3,6 +3,6 @@ call .\venv\Scripts\activate.bat
 python -m pip install --upgrade pip
 python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116
 python -m pip install -r ./requirements.txt
+.\setup-training.bat
 deactivate
-call .\setup-training.bat
 pause
\ No newline at end of file
diff --git a/setup-directml.bat b/setup-directml.bat
index bdd154f..6b5bc98 100755
--- a/setup-directml.bat
+++ b/setup-directml.bat
@@ -3,6 +3,6 @@ call .\venv\Scripts\activate.bat
 python -m pip install --upgrade pip
 python -m pip install torch torchvision torchaudio torch-directml==0.1.13.1.dev230119
 python -m pip install -r ./requirements.txt
+.\setup-training.bat
 deactivate
-call .\setup-training.bat
 pause
\ No newline at end of file
diff --git a/setup_training.bat b/setup-training.bat
similarity index 52%
rename from setup_training.bat
rename to setup-training.bat
index ab6e8a7..b8a5fa9 100755
--- a/setup_training.bat
+++ b/setup-training.bat
@@ -1,2 +1,2 @@
 git clone https://git.ecker.tech/mrq/DL-Art-School dlas
-!python -m pip install -r .\dlas\requirements.txt
\ No newline at end of file
+python -m pip install -r .\dlas\requirements.txt
\ No newline at end of file
diff --git a/update.bat b/update.bat
index d69c975..1b732ba 100755
--- a/update.bat
+++ b/update.bat
@@ -4,9 +4,10 @@ call .\venv\Scripts\activate.bat
 python -m pip install --upgrade pip
 python -m pip install -r ./requirements.txt
 python -m pip install -r ./dlas/requirements.txt
-deactivate
 
 cd dlas
 git pull
 cd ..
+
+deactivate
 pause
\ No newline at end of file
diff --git a/update.sh b/update.sh
index 9b66c1e..b38d76a 100755
--- a/update.sh
+++ b/update.sh
@@ -5,8 +5,9 @@ source ./venv/bin/activate
 python -m pip install --upgrade pip
 python -m pip install -r ./requirements.txt
 python -m pip install -r ./dlas/requirements.txt
-deactivate
 
 cd dlas
 git pull
-cd ..
\ No newline at end of file
+cd ..
+
+deactivate
\ No newline at end of file