From cb98462b027a036a32d9d0f90cc41f1703ee9fca Mon Sep 17 00:00:00 2001
From: henk717 <henk717@msn.com>
Date: Tue, 14 Dec 2021 16:00:35 +0100
Subject: [PATCH] Replace update with switch

My idea to checkout the used branch failed making the updater obsolete, rebranded the switcher to the updater.
---
 switch-versions.bat | 40 ----------------------------------------
 update-kobold.bat   | 28 ++++++++++++++++++++--------
 2 files changed, 20 insertions(+), 48 deletions(-)
 delete mode 100644 switch-versions.bat

diff --git a/switch-versions.bat b/switch-versions.bat
deleted file mode 100644
index 72384e4f..00000000
--- a/switch-versions.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@echo off
-%~d0
-cd %~dp0
-TITLE KoboldAI - Branch Switcher
-SET /P M=<loader.settings
-IF %M%==1 GOTO drivemap
-IF %M%==2 GOTO subfolder
-
-:subfolder
-call miniconda3\condabin\activate
-GOTO GIT
-
-:drivemap
-subst K: miniconda3 >nul
-call K:\python\condabin\activate
-GOTO GIT
-
-:GIT
-ECHO 1. KoboldAI Main (The Official stable version of KoboldAI)
-ECHO 2. KoboldAI United (Development Version, new features but may break at any time)
-SET /P V=Enter your desired version or type your own GIT URL:
-IF %V%==1 (
-SET origin=https://github.com/koboldai/koboldai-client
-SET branch=main
-) ELSE (
-	IF %V%==2 (
-		SET origin=https://github.com/henk717/koboldai
-		SET branch=united
-	) ELSE (
-		SET origin=%v%
-		SET /P branch=Specify the GIT Branch:
-	)
-)
-
-git init     
-git remote remove origin
-git remote add origin %origin%    
-git fetch
-git checkout %branch% -f
-cmd /k
\ No newline at end of file
diff --git a/update-kobold.bat b/update-kobold.bat
index 56a26731..ffa0b13f 100644
--- a/update-kobold.bat
+++ b/update-kobold.bat
@@ -16,13 +16,25 @@ call K:\python\condabin\activate
 GOTO GIT
 
 :GIT
-if exist .git\ (
-	git fetch
-	git checkout -f
-) else (
-	git init     
-	git remote add origin https://github.com/koboldai/koboldai-client    
-	git fetch     
-	git checkout main -f
+ECHO 1. KoboldAI Main (The Official stable version of KoboldAI)
+ECHO 2. KoboldAI United (Development Version, new features but may break at any time)
+SET /P V=Enter your desired version or type your own GIT URL:
+IF %V%==1 (
+SET origin=https://github.com/koboldai/koboldai-client
+SET branch=main
+) ELSE (
+	IF %V%==2 (
+		SET origin=https://github.com/henk717/koboldai
+		SET branch=united
+	) ELSE (
+		SET origin=%v%
+		SET /P branch=Specify the GIT Branch:
+	)
 )
+
+git init     
+git remote remove origin
+git remote add origin %origin%    
+git fetch
+git checkout %branch% -f
 cmd /k
\ No newline at end of file