0.4.0-1

5 files changed, 25 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2dc6191c9a03..af7cc6942d15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = pacman-hook-kernel-install
 	pkgdesc = Pacman hooks for kernel-install.
-	pkgver = 0.3.0
+	pkgver = 0.4.0
 	pkgrel = 1
 	url = https://man.archlinux.org/man/kernel-install.8
 	arch = any
 	license = GPL
 	depends = bash
 	depends = systemd
-	source = kernel-install-add.hook
-	source = kernel-install-remove.hook
-	sha256sums = ca9d66fb7dad75087cd127232fe9d050ede2db9e8c0f988c80a78a31c495c115
-	sha256sums = 13a265c01a0c45026a9793b92288b8e7248f8d849863e44bdb1c8300cc0bb64c
+	source = 90-kernel-install-add.hook
+	source = 90-kernel-install-remove.hook
+	sha256sums = 44f46cc566ff194a033daa2c1a755f387838e68520d4ef8da41730813fc3619d
+	sha256sums = 38f7019c229403a40d04b2f253a17f7644ceb5d67d499f199e9e324d44b432c5
 
 pkgname = pacman-hook-kernel-install
diff --git a/90-kernel-install-add.hook b/90-kernel-install-add.hook
new file mode 100644
index 000000000000..4fabf9dfe2bf
--- /dev/null
+++ b/90-kernel-install-add.hook
@@ -0,0 +1,13 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = File
+Target = usr/lib/modules/*/vmlinuz
+
+[Action]
+Description = Installing kernel and initrd to $BOOT (kernel-install)
+When = PostTransaction
+Exec = /bin/bash -c 'while read -r vmlinuz; do : && kver="$(basename "$(dirname "$vmlinuz")")" && vmlinuz="$(realpath "${vmlinuz}")" && echo + kernel-install add "$kver" "$vmlinuz" && kernel-install -v add "$kver" "$vmlinuz" | sed "/^\+/d"; done'
+Depends = bash
+Depends = systemd
+NeedsTargets
diff --git a/kernel-install-remove.hook b/90-kernel-install-remove.hook
index 33c03d0de003..223251a8e8bd 100644
--- a/kernel-install-remove.hook
+++ b/90-kernel-install-remove.hook
@@ -7,7 +7,7 @@ Target = usr/lib/modules/*/vmlinuz
 [Action]
 Description = Removing kernel and initrd from $BOOT (kernel-install)
 When = PreTransaction
-Exec = /bin/bash -c 'shopt -s extglob && while read -r vmlinuz; do kver="$(basename "$(dirname "${vmlinuz}")")" && printf "kernel-install remove %s\n" "${kver}" && kernel-install remove "${kver}"; done'
+Exec = /bin/bash -c 'while read -r vmlinuz; do : && kver="$(basename "$(dirname "$vmlinuz")")" && echo + kernel-install remove "$kver" && kernel-install -v remove "$kver" | sed "/^\+/d"; done'
 Depends = bash
 Depends = systemd
 NeedsTargets
diff --git a/PKGBUILD b/PKGBUILD
index 1966e89d794b..8a126bb94897 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sergey Zolotorev <sergey.zolotorev@gmail.com>
 
 pkgname=pacman-hook-kernel-install
-pkgver=0.3.0
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Pacman hooks for kernel-install."
 url='https://man.archlinux.org/man/kernel-install.8'
@@ -10,16 +10,15 @@ arch=('any')
 license=('GPL')
 depends=('bash' 'systemd')
 source=(
-	'kernel-install-add.hook'
-	'kernel-install-remove.hook'
+	'90-kernel-install-add.hook'
+	'90-kernel-install-remove.hook'
 )
 
 package() {
-	install -Dm644 'kernel-install-add.hook' 'kernel-install-remove.hook' \
+	install -Dm644 '90-kernel-install-add.hook' '90-kernel-install-remove.hook' \
 		-t"${pkgdir}/usr/share/libalpm/hooks"
 }
 
-
 # sums
-sha256sums=('ca9d66fb7dad75087cd127232fe9d050ede2db9e8c0f988c80a78a31c495c115'
-            '13a265c01a0c45026a9793b92288b8e7248f8d849863e44bdb1c8300cc0bb64c')
+sha256sums=('44f46cc566ff194a033daa2c1a755f387838e68520d4ef8da41730813fc3619d'
+            '38f7019c229403a40d04b2f253a17f7644ceb5d67d499f199e9e324d44b432c5')
diff --git a/kernel-install-add.hook b/kernel-install-add.hook
deleted file mode 100644
index e52338b722da..000000000000
--- a/kernel-install-add.hook
+++ /dev/null
@@ -1,13 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = File
-Target = usr/lib/modules/*/vmlinuz
-
-[Action]
-Description = Installing kernel and initrd to $BOOT (kernel-install)
-When = PostTransaction
-Exec = /bin/bash -c 'shopt -s extglob && while read -r vmlinuz; do kver="$(basename "$(dirname "${vmlinuz}")")" && vmlinuz="$(realpath "${vmlinuz}")" && printf "kernel-install add %s %s\n" "${kver}" "${vmlinuz}" && kernel-install add "${kver}" "${vmlinuz}"; done'
-Depends = bash
-Depends = systemd
-NeedsTargets