Replace snapshot number by commit id in version string

diff --git a/api.php b/api.php
index 0922620ce819a05b2bc18d5ef89452deed7890e1..3479aaf0521830e02606a7b6f8a307d18ae084ff 100755 (executable)
--- 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 49861017c4c6774d43320ff513a52cdd144cdd32..f3c0523500792d34a81819e0c3751bb1bba089fb 100755 (executable)
--- 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 695e188a3c82cbc096af2042c74d54d2a2fd0853..8be3a232660f56a537dfdfe09b02004b78ed1138 100755 (executable)
--- 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": {