From ba850671dc14058b3c9c6013e4c8d1e2da926f3a Mon Sep 17 00:00:00 2001
From: airsquared <36649395+airsquared@users.noreply.github.com>
Date: Sun, 24 Sep 2023 13:50:18 -0700
Subject: [PATCH] Fix docs publish

---
 build.gradle |  6 +++---
 publish.sh   | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 165dd172..4718e370 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,7 +82,7 @@ gradlePlugin {
             implementationClass = 'org.beryx.jlink.JlinkPlugin'
             displayName = 'Badass JLink Plugin'
             description = 'A Gradle plugin that assembles your modules into a custom runtime image'
-            tags.set(['jlink', 'jpms', 'image'])
+            tags.set(['jlink', 'jpackage', 'jpms'])
         }
     }
 }
@@ -98,7 +98,6 @@ asciidoctor {
             'project-version': project.version,
             icons: 'font',
             imagesdir: 'img',
-            'data-uri': '',
             linkattrs: true,
             linkcss: true,
             'git-tag': badassJlinkPluginTag,
@@ -109,10 +108,11 @@ gitPublish {
     repoUri = 'https://github.com/beryx/badass-jlink-plugin.git'
     branch = 'gh-pages'
 
-    def pgType = hasProperty('ghPageType') ? ghPageType : 'latest'
+    def pgType = project.hasProperty('ghPageType') ? ghPageType : 'latest'
     if (pgType == 'init') {
         contents.from file('ghpages')
     } else if (pgType == 'list') {
+        gitPublishReset.dependsOn('update-release-list')
         contents.from file('build/release-list')
     } else {
         contents.from file(asciidoctor.outputDir.path)
diff --git a/publish.sh b/publish.sh
index 2d1832b6..09fb9046 100644
--- a/publish.sh
+++ b/publish.sh
@@ -1,21 +1,23 @@
 #!/bin/bash
 set -ev
 
+GRADLE_COMMAND='./gradlew --info gitPublishPush --rerun-tasks'
+
 if [ "${GITHUB_REF}" == "refs/heads/master" ]; then
   if [ "$(git ls-remote origin gh-pages)" == "" ]; then
     echo Start gitPublishPush with ghPageType=init
-    ./gradlew --no-daemon -i -s gitPublishPush --rerun-tasks -PghPageType=init
+    $GRADLE_COMMAND -PghPageType=init
     echo Finished gitPublishPush with ghPageType=init
   fi
   echo Start gitPublishPush with ghPageType=latest
-  ./gradlew --no-daemon -i -s gitPublishPush --rerun-tasks -PghPageType=latest
+  $GRADLE_COMMAND -PghPageType=latest
   echo Finished gitPublishPush with ghPageType=version
 
   echo Start gitPublishPush with ghPageType=version
-  ./gradlew --no-daemon -i -s gitPublishPush --rerun-tasks -PghPageType=version
+  $GRADLE_COMMAND -PghPageType=version
   echo Finished gitPublishPush with ghPageType=version
 
   echo Start updating releases.md
-  ./gradlew --no-daemon -i -s update-release-list gitPublishPush --rerun-tasks -PghPageType=list
+  $GRADLE_COMMAND -PghPageType=list
   echo Finished updating releases.md
 fi