From 5fee6cd20a552b981bd8cb6d47004ac521d03560 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:12:04 -0400 Subject: [PATCH] openjdk11: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk11/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index 711376c1082..45c775856fa 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -1,7 +1,7 @@ # Template file for 'openjdk11' pkgname=openjdk11 version=11.0.12+7 -revision=1 +revision=2 _java_ver="${version%%.*}" _jdk_home="usr/lib/jvm/openjdk${_java_ver}" wrksrc="jdk${_java_ver}u-jdk-${version}" @@ -160,7 +160,8 @@ openjdk11-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="fontconfig" + depends="fontconfig xbps-triggers>=0.122_1" + triggers="openjdk-profile" alternatives=" java:/usr/bin/java:/${_jdk_home}/bin/java java:/usr/bin/jjs:/${_jdk_home}/bin/jjs @@ -179,11 +180,6 @@ openjdk11-jre_package() { vmove $_jdk_home/$f done - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <