From a2b2c33475a5a2a972086dcd766de611f4672985 Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Sun, 2 Dec 2018 05:38:55 +0100
Subject: [PATCH] tools: Simplify release tools

---
 tools/env.win.bat          |  6 +++++-
 tools/gamemode_release.bat | 10 ++++++++++
 tools/install.bat          |  4 ----
 tools/package.bat          |  4 ----
 tools/proxy_package.bat    |  4 ----
 tools/proxy_release.bat    | 12 +++++++++---
 6 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 tools/gamemode_release.bat
 delete mode 100644 tools/install.bat
 delete mode 100644 tools/package.bat
 delete mode 100644 tools/proxy_package.bat

diff --git a/tools/env.win.bat b/tools/env.win.bat
index 4ee491f..d529aae 100644
--- a/tools/env.win.bat
+++ b/tools/env.win.bat
@@ -1,7 +1,11 @@
 @ECHO OFF
 
+:: Root and repo
+SET "ROOT=%~dp0"
+SET "REPO=%ROOT%..\"
+
 :: Garry's Mod
-SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
+SET "GARRYSMODPATH="
 FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
 IF "%GARRYSMODPATH%" == "" (
 	FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
diff --git a/tools/gamemode_release.bat b/tools/gamemode_release.bat
new file mode 100644
index 0000000..1d3a6d9
--- /dev/null
+++ b/tools/gamemode_release.bat
@@ -0,0 +1,10 @@
+@ECHO OFF
+CALL "env.win.bat"
+
+SET "GMANAME=%TMP%\prophuntextended-%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%.gma"
+
+PUSHD "%REPO%"
+"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%REPO%source" -out "%GMANAME%"
+"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739 -icon "media\rendered\gamemode_workshop.jpg" -addon "%GMANAME%" -changes "To be added (see Github in the mean time)"
+POPD
+PAUSE
diff --git a/tools/install.bat b/tools/install.bat
deleted file mode 100644
index 61567ca..0000000
--- a/tools/install.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@ECHO OFF
-call env.win.bat
-"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739 -icon "media\gamemode_workshop.jpg" -addon "pack.gma" -changes ""
-PAUSE
\ No newline at end of file
diff --git a/tools/package.bat b/tools/package.bat
deleted file mode 100644
index c2a7b39..0000000
--- a/tools/package.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@ECHO OFF
-call env.win.bat
-"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%CD%\source" -out "%CD%\pack.gma"
-PAUSE
\ No newline at end of file
diff --git a/tools/proxy_package.bat b/tools/proxy_package.bat
deleted file mode 100644
index 5b2dc24..0000000
--- a/tools/proxy_package.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@ECHO OFF
-call env.win.bat
-"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%CD%\proxy" -out "%CD%\proxy.gma"
-PAUSE
\ No newline at end of file
diff --git a/tools/proxy_release.bat b/tools/proxy_release.bat
index 12e3439..1fe5716 100644
--- a/tools/proxy_release.bat
+++ b/tools/proxy_release.bat
@@ -1,4 +1,10 @@
 @ECHO OFF
-call env.win.bat
-"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 1327985306 -icon "media\gamemode_workshop.jpg" -addon "proxy.gma" -changes ""
-PAUSE
\ No newline at end of file
+CALL "env.win.bat"
+
+SET "GMANAME=%TMP%\prophuntproxy-%RANDOM%-%RANDOM%-%RANDOM%-%RANDOM%.gma"
+
+PUSHD "%REPO%"
+"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%REPO%source" -out "%GMANAME%"
+"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 1327985306 -icon "media\rendered\gamemode_workshop.jpg" -addon "%GMANAME%" -changes "To be added (see Github in the mean time)"
+POPD
+PAUSE