From 64b922af89397fd097b2a8a9ad59ac3f243f638d Mon Sep 17 00:00:00 2001
From: Yimura <24669514+Yimura@users.noreply.github.com>
Date: Sat, 29 Oct 2022 20:03:06 +0200
Subject: [PATCH] feat(scripts): reorganise based on feedback (#535)

---
 README.md                        |  2 +-
 open_cmd_prompt.bat              |  1 -
 script.bat                       | 14 ++++++++++++++
 scripts/fix_recursive.bat        |  1 -
 scripts/gen_proj.bat             |  5 -----
 scripts/open_vs.bat              |  1 -
 scripts/switch_master_update.bat |  5 ++++-
 scripts/update_repo.bat          |  1 -
 8 files changed, 19 insertions(+), 11 deletions(-)
 delete mode 100644 open_cmd_prompt.bat
 create mode 100644 script.bat
 delete mode 100644 scripts/fix_recursive.bat
 delete mode 100644 scripts/gen_proj.bat
 delete mode 100644 scripts/open_vs.bat
 delete mode 100644 scripts/update_repo.bat

diff --git a/README.md b/README.md
index 1c2fd8ec..1a0e06ed 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ cd YimMenu
 
 Generate project files:
 ```bash
-GenerateProjects.bat
+script.bat
 ```
 
 Now, you will be able to open the solution, and simply build it in Visual Studio.
diff --git a/open_cmd_prompt.bat b/open_cmd_prompt.bat
deleted file mode 100644
index a03f9d44..00000000
--- a/open_cmd_prompt.bat
+++ /dev/null
@@ -1 +0,0 @@
-start cmd.exe
\ No newline at end of file
diff --git a/script.bat b/script.bat
new file mode 100644
index 00000000..6ccdd809
--- /dev/null
+++ b/script.bat
@@ -0,0 +1,14 @@
+@echo off
+git submodule update --init
+
+echo "Updating current branch and submodules"
+git pull && git submodule update
+
+echo "Generating project files"
+premake5 vs2022
+IF %ERRORLEVEL% NEQ 0 (
+  PAUSE
+)
+
+echo "Opening project..."
+start BigBaseV2.sln
\ No newline at end of file
diff --git a/scripts/fix_recursive.bat b/scripts/fix_recursive.bat
deleted file mode 100644
index a59fa05d..00000000
--- a/scripts/fix_recursive.bat
+++ /dev/null
@@ -1 +0,0 @@
-git submodule update --init
\ No newline at end of file
diff --git a/scripts/gen_proj.bat b/scripts/gen_proj.bat
deleted file mode 100644
index dae0891a..00000000
--- a/scripts/gen_proj.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-premake5 vs2022
-IF %ERRORLEVEL% NEQ 0 (
-  PAUSE
-)
diff --git a/scripts/open_vs.bat b/scripts/open_vs.bat
deleted file mode 100644
index df0e2807..00000000
--- a/scripts/open_vs.bat
+++ /dev/null
@@ -1 +0,0 @@
-start BigBaseV2.sln
\ No newline at end of file
diff --git a/scripts/switch_master_update.bat b/scripts/switch_master_update.bat
index 9b4e1c3d..788a61ce 100644
--- a/scripts/switch_master_update.bat
+++ b/scripts/switch_master_update.bat
@@ -1 +1,4 @@
-git checkout master && call update_repo.bat
\ No newline at end of file
+@echo off
+git checkout master
+
+git pull && git submodule update
\ No newline at end of file
diff --git a/scripts/update_repo.bat b/scripts/update_repo.bat
deleted file mode 100644
index 954bfea2..00000000
--- a/scripts/update_repo.bat
+++ /dev/null
@@ -1 +0,0 @@
-git pull && git submodule update
\ No newline at end of file