Skip to content

Commit 04e90f7

Browse files
committed
Combine some columns
* groupId, artifactId -> Artifact * BOM version, Newest release -> Release
1 parent 4a78ed8 commit 04e90f7

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

html-report.sh

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@ echo '<!-- Generated via https://codepo8.github.io/css-fork-on-github-ribbon/ --
4343
echo '<span id="forkongithub"><a href="https://github.com/scijava/status.scijava.org">Fix me on GitHub</a></span>'
4444
echo '<table class="sortable">'
4545
echo '<tr>'
46-
echo '<th>groupId</th>'
47-
echo '<th>artifactId</th>'
48-
echo '<th>BOM version</th>'
49-
echo '<th>Newest release</th>'
46+
echo '<th>Artifact</th>'
47+
echo '<th>Release</th>'
5048
echo '<th>OK</th>'
5149
echo '<th>Last vetted</th>'
5250
echo '<th>Last updated</th>'
@@ -147,14 +145,19 @@ do
147145
gc=$(echo "$g" | sed 's/[^0-9a-zA-Z]/-/g')
148146
ac=$(echo "$a" | sed 's/[^0-9a-zA-Z]/-/g')
149147
echo "<tr class=\"$gc $gc_$ac $bomStatus $releaseStatus\">"
150-
echo "<td>$g</td>"
151148
test "$url" &&
152-
echo "<td><a href=\"$url\">$a</td>" ||
153-
echo "<td>$a</td>"
154-
bomVersionLink=$(printf "$gavFormat" "$g" "$a" "$bomVersion")
155-
echo "<td><a href="$bomVersionLink">$bomVersion</a></td>"
149+
echo "<td><a href=\"$url\">$g : $a</td>" ||
150+
echo "<td>$g : $a</td>"
151+
156152
newestReleaseLink=$(printf "$gavFormat" "$g" "$a" "$newestRelease")
157-
echo "<td><a href="$newestReleaseLink">$newestRelease</a></td>"
153+
test "$bomVersion" = "$newestRelease" && {
154+
echo "<a href="$newestReleaseLink">$newestRelease</a></td>"
155+
} || {
156+
bomVersionLink=$(printf "$gavFormat" "$g" "$a" "$bomVersion")
157+
echo "<td><a href="$bomVersionLink">$bomVersion</a> &rarr; "
158+
echo "<a href="$newestReleaseLink">$newestRelease</a></td>"
159+
}
160+
158161
echo "<td>$bomOK</td>"
159162
if [ "$lastVetted" -eq 0 ]
160163
then

0 commit comments

Comments
 (0)