From 953f615e3d1135f1016d001a53c7fedc016e0422 Mon Sep 17 00:00:00 2001
From: Henk <henk@henk.tech>
Date: Wed, 31 May 2023 02:29:26 +0200
Subject: [PATCH] Conda deactivation fix

---
 Jupyter.bat                  | 7 +++++++
 commandline.bat              | 2 +-
 install_git_transformers.bat | 2 ++
 install_requirements.bat     | 2 +-
 play.bat                     | 2 +-
 update-koboldai.bat          | 2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Jupyter.bat b/Jupyter.bat
index df19a07f..c00d250d 100644
--- a/Jupyter.bat
+++ b/Jupyter.bat
@@ -6,6 +6,13 @@ IF %M%==1 GOTO drivemap
 IF %M%==2 GOTO subfolder
 IF %M%==3 GOTO drivemap_B
 
+:Isolation
+call conda deactivate 2>NUL
+set Path=%windir%\system32;%windir%;C:\Windows\System32\Wbem;%windir%\System32\WindowsPowerShell\v1.0\;%windir%\System32\OpenSSH\
+SET CONDA_SHLVL=
+SET PYTHONNOUSERSITE=1
+SET PYTHONPATH=
+
 :subfolder
 umamba.exe install --no-shortcuts -r miniconda3 -n base -c conda-forge jupyterlab jupyterlab-git
 call miniconda3\condabin\activate
diff --git a/commandline.bat b/commandline.bat
index f7293eda..94e61608 100644
--- a/commandline.bat
+++ b/commandline.bat
@@ -2,7 +2,7 @@
 cd /D %~dp0
 
 :Isolation
-conda deactivate 2>NUL
+call conda deactivate 2>NUL
 set Path=%windir%\system32;%windir%;C:\Windows\System32\Wbem;%windir%\System32\WindowsPowerShell\v1.0\;%windir%\System32\OpenSSH\
 SET CONDA_SHLVL=
 SET PYTHONNOUSERSITE=1
diff --git a/install_git_transformers.bat b/install_git_transformers.bat
index 8c6257cc..34194459 100644
--- a/install_git_transformers.bat
+++ b/install_git_transformers.bat
@@ -2,6 +2,8 @@
 cd /D %~dp0
 
 :Isolation
+call conda deactivate 2>NUL
+set Path=%windir%\system32;%windir%;C:\Windows\System32\Wbem;%windir%\System32\WindowsPowerShell\v1.0\;%windir%\System32\OpenSSH\
 SET CONDA_SHLVL=
 SET PYTHONNOUSERSITE=1
 SET PYTHONPATH=
diff --git a/install_requirements.bat b/install_requirements.bat
index 73e73594..9756a18f 100644
--- a/install_requirements.bat
+++ b/install_requirements.bat
@@ -10,7 +10,7 @@ Reg add "HKLM\SYSTEM\CurrentControlSet\Control\FileSystem" /v "LongPathsEnabled"
 cd /D %~dp0
 
 :Isolation
-conda deactivate 2>NUL
+call conda deactivate 2>NUL
 set Path=%windir%\system32;%windir%;C:\Windows\System32\Wbem;%windir%\System32\WindowsPowerShell\v1.0\;%windir%\System32\OpenSSH\
 SET CONDA_SHLVL=
 SET PYTHONNOUSERSITE=1
diff --git a/play.bat b/play.bat
index 91688b54..c9e82b83 100644
--- a/play.bat
+++ b/play.bat
@@ -2,7 +2,7 @@
 cd /D %~dp0
 
 :Isolation
-conda deactivate 2>NUL
+call conda deactivate 2>NUL
 set Path=%windir%\system32;%windir%;C:\Windows\System32\Wbem;%windir%\System32\WindowsPowerShell\v1.0\;%windir%\System32\OpenSSH\
 SET CONDA_SHLVL=
 SET PYTHONNOUSERSITE=1
diff --git a/update-koboldai.bat b/update-koboldai.bat
index f99e6598..1fd66e4a 100644
--- a/update-koboldai.bat
+++ b/update-koboldai.bat
@@ -2,7 +2,7 @@
 cd /d %~dp0
 
 :Isolation
-conda deactivate 2>NUL
+call conda deactivate 2>NUL
 set Path=%windir%\system32;%windir%;C:\Windows\System32\Wbem;%windir%\System32\WindowsPowerShell\v1.0\;%windir%\System32\OpenSSH\
 SET CONDA_SHLVL=
 SET PYTHONNOUSERSITE=1