Hook trigger was generalized to trigger more accurately (used trigger defined in 90-linux.hook)

The hook names were changed for a better execution order

5 files changed, 33 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f76dc189009..7bc0dd99a651 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pacman-boot-backup-hook
 	pkgdesc = Pacman hook that uses rsync to backup the /boot directory prior and post to upgrades of the linux or systemd package.
-	pkgver = 1.2
+	pkgver = 1.3
 	pkgrel = 1
 	changelog = CHANGELOG
 	arch = any
@@ -8,13 +8,13 @@ pkgbase = pacman-boot-backup-hook
 	depends = rsync
 	source = LICENSE
 	source = backup-boot-partition
-	source = bootbackup.post.hook
-	source = bootbackup.pre.hook
+	source = 50_bootbackup.hook
+	source = uu_bootbackup.hook
 	source = pacman-boot-backup.conf
 	md5sums = ac9ac34b11dd5a53d096a734ab677479
 	md5sums = 3cd8131ceb4563164ab12cc7b7d61ed6
-	md5sums = 688911051c14693e4a65e043ecb5bde4
-	md5sums = 05868b278d10a4d5b1493d8b33d34139
+	md5sums = c5cca1a979e913f87e859436919c016c
+	md5sums = f041fe352b3f48f08a1afad132312b94
 	md5sums = c5d37420cddc494cba64930ea54518b1
 
 pkgname = pacman-boot-backup-hook
diff --git a/bootbackup.pre.hook b/50_bootbackup.hook
index dec38891ace3..906875dcb52c 100644
--- a/bootbackup.pre.hook
+++ b/50_bootbackup.hook
@@ -1,11 +1,17 @@
 [Trigger]
+Type = Package
 Operation = Install
 Operation = Upgrade
 Operation = Remove
-Type = Package
-Target = linux
 Target = systemd
 
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-linux
+Target = usr/lib/initcpio/*
+
 [Action]
 Description = Backup boot partition...
 When = PreTransaction
diff --git a/CHANGELOG b/CHANGELOG
index b3f245aca381..5c2dc8086c9f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v1.3 (2018/01/14):
+- The hook trigger has been modified to match that of 90-linux.hook
+- The hook names were changed in order to execute not too early/late
+  - In particular, execution order now plays nicely together with systemd-boot-pacman-hook AUR package
+
 v1.2 (2018/01/07):
 - The hook now also creates a backup after the package upgrade
   The post hook is performed after the 90-linux.hook
diff --git a/PKGBUILD b/PKGBUILD
index e116b1c15312..90cf4233db36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Markus Schanz <coksnuss@googlemail.com>
 pkgname=pacman-boot-backup-hook
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="Pacman hook that uses rsync to backup the /boot directory prior and post to upgrades of the linux or systemd package."
 arch=('any')
@@ -10,13 +10,13 @@ depends=('rsync')
 
 source=('LICENSE'
         'backup-boot-partition'
-        'bootbackup.post.hook'
-        'bootbackup.pre.hook'
+        '50_bootbackup.hook'
+        'uu_bootbackup.hook'
 	'pacman-boot-backup.conf')
 md5sums=('ac9ac34b11dd5a53d096a734ab677479'
          '3cd8131ceb4563164ab12cc7b7d61ed6'
-         '688911051c14693e4a65e043ecb5bde4'
-         '05868b278d10a4d5b1493d8b33d34139'
+         'c5cca1a979e913f87e859436919c016c'
+         'f041fe352b3f48f08a1afad132312b94'
          'c5d37420cddc494cba64930ea54518b1')
 
 package() {
@@ -27,8 +27,8 @@ package() {
 	install -m 0644 $srcdir/pacman-boot-backup.conf $pkgdir/etc
 
 	install -m 0755 -d $pkgdir/usr/share/libalpm/hooks
-	install -m 0644 $srcdir/bootbackup.post.hook $pkgdir/usr/share/libalpm/hooks
-	install -m 0644 $srcdir/bootbackup.pre.hook $pkgdir/usr/share/libalpm/hooks
+	install -m 0644 $srcdir/50_bootbackup.hook $pkgdir/usr/share/libalpm/hooks
+	install -m 0644 $srcdir/uu_bootbackup.hook $pkgdir/usr/share/libalpm/hooks
 
 	install -m 0755 -d $pkgdir/usr/share/libalpm/scripts
 	install -m 0755 $srcdir/backup-boot-partition $pkgdir/usr/share/libalpm/scripts
diff --git a/bootbackup.post.hook b/uu_bootbackup.hook
index 7d7aebb7e932..9718607fdaa3 100644
--- a/bootbackup.post.hook
+++ b/uu_bootbackup.hook
@@ -1,11 +1,17 @@
 [Trigger]
+Type = Package
 Operation = Install
 Operation = Upgrade
 Operation = Remove
-Type = Package
-Target = linux
 Target = systemd
 
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-linux
+Target = usr/lib/initcpio/*
+
 [Action]
 Description = Backup boot partition...
 When = PostTransaction