This commit is contained in:
Toru the Red Fox 2022-07-23 15:24:54 +01:00
commit 9c75bd83aa

View file

@ -11,9 +11,7 @@ public static class VersionHelper
try try
{ {
CommitHash = ResourceHelper.ReadManifestFile("gitVersion.txt"); CommitHash = ResourceHelper.ReadManifestFile("gitVersion.txt");
string DirtyVerString = (IsDirty) ? "-dirty" : ""; Branch = ResourceHelper.ReadManifestFile("gitBranch.txt");
string _Branch = ResourceHelper.ReadManifestFile("gitBranch.txt");
Branch = $"{_Branch}{DirtyVerString}";
string rawRevision = ResourceHelper.ReadManifestFile("gitRevCount.txt"); string rawRevision = ResourceHelper.ReadManifestFile("gitRevCount.txt");
Revision = (Branch == "main") ? $"r{rawRevision}" : $"{Branch}_r{rawRevision}"; Revision = (Branch == "main") ? $"r{rawRevision}" : $"{Branch}_r{rawRevision}";
@ -52,6 +50,8 @@ public static class VersionHelper
"Please make sure you are properly disclosing the source code to any users who may be using this instance.", "Please make sure you are properly disclosing the source code to any users who may be using this instance.",
LogArea.Startup LogArea.Startup
); );
string rawRevision = ResourceHelper.ReadManifestFile("gitRevCount.txt");
Revision = $"{Branch}-dirty_r{rawRevision}";
CanCheckForUpdates = false; CanCheckForUpdates = false;
} }
} }