liberica-jdk-17-full-bin: fix `Exec` and `Icon` value in .desktop files

5 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e17322bd3021..b52a6ceee889 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = liberica-jdk-17-full-bin
 	pkgdesc = BellSoft builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads. Full version includes OpenJFX.
 	pkgver = 17.0.6.u10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bell-sw.com/
 	install = liberica-jdk-17-full.install
 	arch = aarch64
@@ -50,9 +50,9 @@ pkgbase = liberica-jdk-17-full-bin
 	source = liberica-jdk-17-full24.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
 	source = liberica-jdk-17-full32.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
 	source = liberica-jdk-17-full48.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png
-	sha1sums = 19873c53aaf234d215b9892450bfd4e95c13ed7c
-	sha1sums = 5347a8c12c16a29aada0babdfda5dbef236717c0
-	sha1sums = 8a66b7e3c5fa8b2f11ee1dd2b11127f7156cb60b
+	sha1sums = 7d79a8c26a125f55f52493df7dca2189c8521b3c
+	sha1sums = 80a166acf99b351aa466452782a8faac3eca2d26
+	sha1sums = 4b5684dc98370ecbff274195b42c3ce559226596
 	sha1sums = 36096a57cebd346e08efc68326fe77960d43726f
 	sha1sums = b8233f9ff931ce97a265827fac18ed90f4e248c6
 	sha1sums = a0da2952bc87a425182c3ac88e88649fbaa7cb65
diff --git a/PKGBUILD b/PKGBUILD
index 162186957a20..c41d8a1467a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,13 @@
 
 # This PKGBUILD adapted from zulu-11-bin
 
-_jdkname=liberica-jdk-17-full
-pkgname="${_jdkname}-bin"
+_pkgbase=liberica-jdk-full
 _java_ver=17
+_jdkname="liberica-jdk-${_java_ver}-full"
+pkgname="${_jdkname}-bin"
 pkgver=${_java_ver}.0.6.u10
 _pkgver=${_java_ver}.0.6+10
-pkgrel=1
+pkgrel=2
 pkgdesc='BellSoft builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads. Full version includes OpenJFX.'
 arch=(aarch64 armv7h armv8h x86_64)
 url='https://bell-sw.com/'
@@ -55,9 +56,9 @@ source=(freedesktop-java.desktop.in
         ${_jdkname}24.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
         ${_jdkname}32.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
         ${_jdkname}48.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png)
-sha1sums=(19873c53aaf234d215b9892450bfd4e95c13ed7c
-          5347a8c12c16a29aada0babdfda5dbef236717c0
-          8a66b7e3c5fa8b2f11ee1dd2b11127f7156cb60b
+sha1sums=(7d79a8c26a125f55f52493df7dca2189c8521b3c
+          80a166acf99b351aa466452782a8faac3eca2d26
+          4b5684dc98370ecbff274195b42c3ce559226596
           36096a57cebd346e08efc68326fe77960d43726f
           b8233f9ff931ce97a265827fac18ed90f4e248c6
           a0da2952bc87a425182c3ac88e88649fbaa7cb65
@@ -78,7 +79,7 @@ _jvmdir="/usr/lib/jvm/${_jdkname}"
 
 prepare() {
   for f in *.desktop.in; do
-    sed "s|@@VER@@|${pkgver/.*}|g" $f >> ${f/.in}
+    sed "s|@@VER@@|${pkgver/.*}|g; s|@@PATH@@|${_jvmdir}|g; s|@@ICON@@|${_jdkname}|g;" $f >> ${f/.in}
   done
 }
 
diff --git a/freedesktop-java.desktop.in b/freedesktop-java.desktop.in
index 2b5733c2a5ee..44a07c6ab411 100644
--- a/freedesktop-java.desktop.in
+++ b/freedesktop-java.desktop.in
@@ -2,9 +2,9 @@
 Name=OpenJDK Java @@VER@@ Runtime
 Comment=OpenJDK Java @@VER@@ Runtime
 Keywords=java;runtime
-Exec=/usr/lib/jvm/liberica-jdk-full/bin/java -jar
+Exec=@@PATH@@/bin/java -jar
 Terminal=false
 Type=Application
-Icon=liberica-jdk-full
+Icon=@@ICON@@
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/freedesktop-jconsole.desktop.in b/freedesktop-jconsole.desktop.in
index 1c7ece962785..ff129537dc2e 100644
--- a/freedesktop-jconsole.desktop.in
+++ b/freedesktop-jconsole.desktop.in
@@ -2,8 +2,8 @@
 Name=OpenJDK Java @@VER@@ Console
 Comment=OpenJDK Java @@VER@@ Monitoring & Management Console
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/liberica-jdk-full/bin/jconsole
+Exec=@@PATH@@/bin/jconsole
 Terminal=false
 Type=Application
-Icon=liberica-jdk-full
+Icon=@@ICON@@
 Categories=Application;System;
diff --git a/freedesktop-jshell.desktop.in b/freedesktop-jshell.desktop.in
index 3bfa61895ff6..e23a2700926a 100644
--- a/freedesktop-jshell.desktop.in
+++ b/freedesktop-jshell.desktop.in
@@ -2,8 +2,8 @@
 Name=OpenJDK Java @@VER@@ Shell
 Comment=OpenJDK Java @@VER@@ Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/liberica-jdk-full/bin/jshell
+Exec=@@PATH@@/bin/jshell
 Terminal=true
 Type=Application
-Icon=liberica-jdk-full
+Icon=@@ICON@@
 Categories=Application;System;