From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Thu, 3 Jun 2021 19:49:37 +0000 (+0200)
Subject: Replace snapshot number by commit id in version string
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6e68489b15ed09b46e9ad8d85bbfb286436479ff;p=dragonblocks.git

Replace snapshot number by commit id in version string
---

diff --git a/api.php b/api.php
index 0922620..3479aaf 100755
--- a/api.php
+++ b/api.php
@@ -50,5 +50,8 @@
 			file_put_contents("worlds/" . $_POST["name"] . "/world.json", $_POST["world"]);
 			file_put_contents("worlds/" . $_POST["name"] . "/owner.txt", get_username());
 			break;
+		case "commitID":
+			echo shell_exec("git rev-parse --short HEAD");
+			break;
 	}
 ?>
diff --git a/engine/init.js b/engine/init.js
index 4986101..f3c0523 100755
--- a/engine/init.js
+++ b/engine/init.js
@@ -31,6 +31,11 @@ dragonblocks = {};
 dragonblocks.settings = $.getJSON("settings.json").responseJSON;
 dragonblocks.backlog = "";
 dragonblocks.mods = [];
+dragonblocks.settings.version.commit = $.get({
+	url: "api.php",
+	method: "POST",
+	data: {call: "commitID"}
+}).responseText || dragonblocks.settings.version.commit;
 dragonblocks.gamemods = $.getJSON({
 	method: "POST",
 	url: "api.php",
@@ -73,7 +78,7 @@ dragonblocks.getModpath = function(mod){
 }
 dragonblocks.getVersion = function(){
 	let version = dragonblocks.settings.version;
-	return "Dragonblocks " + version.major + "." + version.minor + (version.patch ? "." + version.patch : "") + (version.snapshot ? "-dev-" + version.snapshot : "");
+	return "Dragonblocks " + version.major + "." + version.minor + (version.patch ? "." + version.patch : "") + (version.development ? "-dev-" + version.commit : "");
 }
 dragonblocks.start = function(){
 	for(let func of dragonblocks.onStartFunctions)
diff --git a/settings.json b/settings.json
index 695e188..8be3a23 100755
--- a/settings.json
+++ b/settings.json
@@ -3,7 +3,8 @@
 		"major": 3,
 		"minor": 1,
 		"patch": 0,
-		"snapshot": 1,
+		"development": true,
+		"commit": "?",
 		"copyright": "© 2019 - 2021 Elidragon. Please Distribute!"
 	},
 	"inventory": {