diff --git a/patches/server/Add-git-branch-and-commit-to-manifest.patch b/patches/server/Add-git-branch-and-commit-to-manifest.patch index df03ab84df..13b9713d5c 100644 --- a/patches/server/Add-git-branch-and-commit-to-manifest.patch +++ b/patches/server/Add-git-branch-and-commit-to-manifest.patch @@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/build.gradle.kts @@ -0,0 +0,0 @@ tasks.jar { val git = Git(rootProject.layout.projectDirectory.path) - val gitHash = git("rev-parse", "HEAD").getText().substring(0, 7) + val gitHash = git("rev-parse", "--short=7", "HEAD").getText() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" + val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper attributes( diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 929c9996cd..f246533bed 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -70,7 +70,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + manifest { + val git = Git(rootProject.layout.projectDirectory.path) -+ val gitHash = git("rev-parse", "HEAD").getText().substring(0, 7) ++ val gitHash = git("rev-parse", "--short=7", "HEAD").getText() + val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" + attributes( + "Main-Class" to "org.bukkit.craftbukkit.Main",