Use System.getenv instead of System.getProperty

This commit is contained in:
RednedEpic 2022-02-27 23:11:27 -06:00
parent e1e4b5059c
commit 2a667ed096

View file

@ -87,16 +87,12 @@ configure<BlossomExtension> {
replaceToken("\${version}", "${project.version} ($gitVersion)", mainFile) replaceToken("\${version}", "${project.version} ($gitVersion)", mainFile)
replaceToken("\${gitVersion}", gitVersion, mainFile) replaceToken("\${gitVersion}", gitVersion, mainFile)
replaceToken("\${buildNumber}", Integer.parseInt(System.getProperty("BUILD_NUMBER", "-1")), mainFile) replaceToken("\${buildNumber}", buildNumber(), mainFile)
replaceToken("\${branch}", branchName(), mainFile) replaceToken("\${branch}", branchName(), mainFile)
} }
fun Project.branchName(): String { fun Project.branchName(): String =
val out = ByteArrayOutputStream() System.getenv("GIT_BRANCH") ?: "local/dev"
exec {
commandLine = listOf("git", "rev-parse", "--abbrev-ref", "HEAD")
standardOutput = out
}
return out.toString(Charsets.UTF_8.name()).trim() fun Project.buildNumber(): Int =
} Integer.parseInt(System.getenv("BUILD_NUMBER") ?: "-1")