mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2025-01-13 19:51:39 +01:00
Add falback if branch command fails
This commit is contained in:
parent
4be0b48600
commit
124cbc6db6
2
api
2
api
@ -1 +1 @@
|
||||
Subproject commit 768daee3c4c80f7c1c2c3096241818c27c7b5fa2
|
||||
Subproject commit 67a7352c672d054b9e6cd0e996a4fa92ba0c237e
|
@ -15,7 +15,7 @@ fun Project.gitVersion(): String {
|
||||
val lastTag = if (runCommand("git tag", "").isEmpty()) "" else runCommand("git describe --tags --abbrev=0", "")
|
||||
val lastVersion = if (lastTag.isEmpty()) "0.0" else lastTag.substring(1) // remove the leading 'v'
|
||||
val commits = runCommand("git rev-list --count $lastTag..HEAD", "0")
|
||||
val branch = runCommand("git branch --show-current")
|
||||
val branch = runCommand("git branch --show-current", "master")
|
||||
val gitVersion = lastVersion +
|
||||
(if (branch == "master") "" else "-${branch.replace('/', '.')}") +
|
||||
(if (commits == "0") "" else "-$commits") +
|
||||
|
Loading…
Reference in New Issue
Block a user