From 7f37157f24c8e9f150ae747efaa4cf8c9e9518e2 Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 12 May 2023 12:55:03 +0400 Subject: [PATCH] xbps-triggers: exit kernel hook on error Exit kernel-hook scripts with error in case of error in hook. Ticket: 42047 --- srcpkgs/xbps-triggers/files/kernel-hooks | 7 +++---- srcpkgs/xbps-triggers/template | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xbps-triggers/files/kernel-hooks b/srcpkgs/xbps-triggers/files/kernel-hooks index 61574e90843e..8741e14ddb97 100755 --- a/srcpkgs/xbps-triggers/files/kernel-hooks +++ b/srcpkgs/xbps-triggers/files/kernel-hooks @@ -38,11 +38,10 @@ run) # A package may export "kernel_hooks_version" as a hint # to pass this version to the hooks. - if [ -n "${kernel_hooks_version}" ]; then - env ROOTDIR="." ${_file_} ${PKGNAME} ${kernel_hooks_version} - else - env ROOTDIR="." ${_file_} ${PKGNAME} ${VERSION} + if [ -z "${kernel_hooks_version}" ]; then + kernel_hooks_version="${VERSION}" fi + env ROOTDIR="." ${_file_} ${PKGNAME} ${kernel_hooks_version} || exit 1 done ;; *) diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index aa62e0902528..b3ebff2be147 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,7 +1,7 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers version=0.124 -revision=1 +revision=2 bootstrap=yes short_desc="XBPS triggers for Void Linux" maintainer="Enno Boland "