From 259cbdc15d92042316f5fd11bda068e5ca2d0f8a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 20 Mar 2022 16:12:02 -0400 Subject: [PATCH] openjdk8: move /etc/profile.d/10-openjdk*.sh to trigger --- srcpkgs/openjdk8/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 9cced29b4be..9832b18555a 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -4,7 +4,7 @@ # TODO: config files? pkgname=openjdk8 version=8u322b04 -revision=1 +revision=2 _jdk_update="${version#*u}" _jdk_update="${_jdk_update%b*}" _jdk_build="${version#*b}" @@ -221,6 +221,8 @@ openjdk8-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}/jre/bin/java java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs @@ -236,10 +238,6 @@ openjdk8-jre_package() { " pkg_install() { vmove ${_jdk_home}/jre - vmkdir etc/profile.d - cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <