From 5aec638e28e311e4b932ad68c88234b6df21383c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:12:05 -0400 Subject: [PATCH] openjdk17: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk17/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template index 2554e49c54e..f60e96f7908 100644 --- a/srcpkgs/openjdk17/template +++ b/srcpkgs/openjdk17/template @@ -1,7 +1,7 @@ # Template file for 'openjdk17' pkgname=openjdk17 version=17.0.3+7 -revision=1 +revision=2 _gtest_ver=1.8.1 _java_ver="${version%%.*}" _jdk_update="${version#*+}" @@ -170,6 +170,8 @@ openjdk17-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" short_desc+=" - runtime components" provides="java-runtime-${version}_1" + depends="xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_jdk_home}/bin/java java:/usr/bin/jfr:/${_jdk_home}/bin/jfr @@ -185,11 +187,6 @@ openjdk17-jre_package() { vmove $_jdk_home/$f done - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk17.sh <<-EOF -export JAVA_HOME=\${JAVA_HOME=/$_jdk_home} -EOF - vlicense ASSEMBLY_EXCEPTION vlicense LICENSE }