VERY experimental Nintendo Switch 2 emulator
C++
android: Clean up git commands in build.gradle
t895b5721efd3ba2
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex 53aafa08c2..7318338fe4 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -228,71 +228,33 @@ dependencies {implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")}-fun getGitVersion(): String {- var versionName = "0.0"-- try {- versionName = ProcessBuilder("git", "describe", "--always", "--long")+fun runGitCommand(command: List<String>): String {+ return try {+ ProcessBuilder(command).directory(project.rootDir).redirectOutput(ProcessBuilder.Redirect.PIPE).redirectError(ProcessBuilder.Redirect.PIPE).start().inputStream.bufferedReader().use { it.readText() }.trim()- .replace(Regex("(-0)?-[^-]+$"), "")} catch (e: Exception) {- logger.error("Cannot find git, defaulting to dummy version number")- }-- if (System.getenv("GITHUB_ACTIONS") != null) {- val gitTag = System.getenv("GIT_TAG_NAME")- versionName = gitTag ?: versionName+ logger.error("Cannot find git")+ ""}-- return versionName}-fun getGitHash(): String {- try {- val processBuilder = ProcessBuilder("git", "rev-parse", "--short", "HEAD")- processBuilder.directory(project.rootDir)- val process = processBuilder.start()- val inputStream = process.inputStream- val errorStream = process.errorStream- process.waitFor()-- return if (process.exitValue() == 0) {- inputStream.bufferedReader()- .use { it.readText().trim() } // return the value of gitHash- } else {- val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }- logger.error("Error running git command: $errorMessage")- "dummy-hash" // return a dummy hash value in case of an error- }- } catch (e: Exception) {- logger.error("$e: Cannot find git, defaulting to dummy build hash")- return "dummy-hash" // return a dummy hash value in case of an error+fun getGitVersion(): String {+ val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {+ val gitTag = System.getenv("GIT_TAG_NAME") ?: ""+ gitTag+ } else {+ runGitCommand(listOf("git", "describe", "--always", "--long"))+ .replace(Regex("(-0)?-[^-]+$"), "")}+ return versionName.ifEmpty { "0.0" }}-fun getBranch(): String {- try {- val processBuilder = ProcessBuilder("git", "rev-parse", "--abbrev-ref", "HEAD")- processBuilder.directory(project.rootDir)- val process = processBuilder.start()- val inputStream = process.inputStream- val errorStream = process.errorStream- process.waitFor()-- return if (process.exitValue() == 0) {- inputStream.bufferedReader()- .use { it.readText().trim() } // return the value of gitHash- } else {- val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }- logger.error("Error running git command: $errorMessage")- "dummy-hash" // return a dummy hash value in case of an error- }- } catch (e: Exception) {- logger.error("$e: Cannot find git, defaulting to dummy build hash")- return "dummy-hash" // return a dummy hash value in case of an error- }-}+fun getGitHash(): String =+ runGitCommand(listOf("git", "rev-parse", "--short", "HEAD")).ifEmpty { "dummy-hash" }++fun getBranch(): String =+ runGitCommand(listOf("git", "rev-parse", "--abbrev-ref", "HEAD")).ifEmpty { "dummy-hash" }