From 1c592ad18e2be9e1ee206bb786c18f805352d25a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 21 Dec 2023 17:36:47 -0500 Subject: [PATCH] xbps-triggers: update to 0.127. get rid of the openjdk profile hook. it should not have been done like this. --- Manual.md | 8 ----- srcpkgs/xbps-triggers/files/openjdk-profile | 39 --------------------- srcpkgs/xbps-triggers/template | 2 +- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100755 srcpkgs/xbps-triggers/files/openjdk-profile diff --git a/Manual.md b/Manual.md index 667ab634f97..e6a98551eee 100644 --- a/Manual.md +++ b/Manual.md @@ -62,7 +62,6 @@ packages for XBPS, the `Void Linux` native packaging system. * [kernel-hooks](#triggers_kernel_hooks) * [mimedb](#triggers_mimedb) * [mkdirs](#triggers_mkdirs) - * [openjdk-profile](#triggers_openjdk_profile) * [pango-modules](#triggers_pango_module) * [pycompile](#triggers_pycompile) * [register-shell](#triggers_register_shell) @@ -2016,13 +2015,6 @@ During removal it will delete the directory using `rmdir`. To include this trigger use the `make_dirs` variable, as the trigger won't do anything unless it is defined. - -#### openjdk-profile - -The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that -sets the `JAVA_HOME` environment variable to the currently-selected alternative for -`/usr/bin/java` on installation. This trigger must be manually requested. - #### pango-modules diff --git a/srcpkgs/xbps-triggers/files/openjdk-profile b/srcpkgs/xbps-triggers/files/openjdk-profile deleted file mode 100755 index 007d9cd9eed..00000000000 --- a/srcpkgs/xbps-triggers/files/openjdk-profile +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Adds an entry to /etc/profile.d for setting $JAVA_HOME. -# -# Arguments: $ACTION = [run/targets] -# $TARGET = [post-install/pre-remove] -# $PKGNAME -# $VERSION -# $UPDATE = [yes/no] -# -ACTION="$1" -TARGET="$2" -PKGNAME="$3" -VERSION="$4" -UPDATE="$5" - -jdkprofile=etc/profile.d/openjdk.sh - -case "$ACTION" in -targets) - echo "post-install" - ;; -run) - [ -f "$jdkprofile" ] && exit 0 - - cat > "$jdkprofile" <<'EOF' -if _java_bin=$(readlink -e /usr/bin/java); then - _java_bin="${_java_bin%/bin/java}" - [ -d "${_java_bin}" ] && export JAVA_HOME="${JAVA_HOME:=${_java_bin}}" -fi -unset _java_bin -EOF - ;; -*) - exit 1 - ;; -esac - -exit 0 diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 76c3a6b27fa..66936411a42 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,6 +1,6 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.126 +version=0.127 revision=1 bootstrap=yes short_desc="XBPS triggers for Void Linux"