From 4c515198bbff4c44e5bd2e8260999b0870c3be5e Mon Sep 17 00:00:00 2001
From: Kyle Wood <kyle@denwav.dev>
Date: Sat, 26 Jun 2021 23:51:03 -0500
Subject: [PATCH] Trim whitspace off of git hash (oops)

---
 patches/server/Add-git-branch-and-commit-to-manifest.patch | 2 +-
 patches/server/Setup-Gradle-project.patch                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 13b9713d5c..85783bf1f2 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", "--short=7", "HEAD").getText()
+         val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          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 f246533bed..f6cd2f132a 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", "--short=7", "HEAD").getText()
++        val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
 +        val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
 +        attributes(
 +            "Main-Class" to "org.bukkit.craftbukkit.Main",