From 8e617f5a6c92a21be270ec190261d979deac965f Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Sat, 18 Apr 2020 15:48:19 +0800
Subject: Added FluidSupportProvider

Signed-off-by: shedaniel <daniel@shedaniel.me>
---
 build.gradle | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'build.gradle')

diff --git a/build.gradle b/build.gradle
index 06dea5c70..13b572b6e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -114,14 +114,23 @@ task remapMavenJar(type: RemapJarTask, dependsOn: jar) {
 
 def releaseChangelog = "No changelog"
 
-/* Thank you modmenu */
+/* Thank you modmenu & fablabs */
 task releaseOnCf {
     def df = new SimpleDateFormat("yyyy-MM-dd HH:mm")
     df.setTimeZone(TimeZone.getTimeZone("UTC"))
-    def currentBranch = "git rev-parse --abbrev-ref HEAD".execute().in.readLines().join('\n')
+    def currentBranch
+    if (System.env.BRANCH_NAME) {
+        branch = System.env.BRANCH_NAME
+        branch = branch.substring(branch.lastIndexOf("/")+1)
+    } else {
+        branch = "git rev-parse --abbrev-ref HEAD".execute().in.text.trim()
+    }
+    if (currentBranch == "HEAD") {
+        branch = "git rev-parse --short HEAD".execute().in.text.trim()
+    }
     def time = df.format(new Date())
     def changes = new StringBuilder()
-    changes << "<h2>REI v$project.version for $project.supported_version</h2>Updated at <b>$time</b>.<br><a href=\"https://www.github.com/shedaniel/RoughlyEnoughItems/commits/$currentBranch\">Click here for changelog</a>"
+    changes << "<h2>REI v$project.version for $project.supported_version</h2>Updated at <b>$time</b>.<br><a href=\"https://www.github.com/shedaniel/RoughlyEnoughItems/commits/$branch\">Click here for changelog</a>"
     def proc = "git log --max-count=200 --pretty=format:\"%s\"".execute()
     proc.in.eachLine { line ->
         def processedLine = line.toString()
-- 
cgit