Renamed to execute early

Changed path detection

Changed mode

Deleted some innecesary lines. Remove dracut flags

Use sha256sum, fix install mode

Cleaner package

Add dracut wiki page

Generate srcinfo

6 files changed, 44 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d18d64890cc..6dae5e13b021 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = dracut-hook
-	pkgdesc = dracut hook for archlinux
-	pkgver = 0.3
-	pkgrel = 2
-	url = https://tackitt.net
+	pkgdesc = Install/remove hooks for dracut
+	pkgver = 0.4
+	pkgrel = 1
+	url = https://dracut.wiki.kernel.org/index.php/Main_Page
 	arch = any
 	license = BSD
 	depends = dracut
 	source = dracut-install
 	source = dracut-remove
 	source = 90-dracut-install.hook
-	source = 90-dracut-remove.hook
-	md5sums = ca2782fe7bd5e5ec01ba1043df8db092
-	md5sums = d47474311fe65faf9358727f75526389
-	md5sums = 8fa0ed0a9aa50f2ac6525d3264f04d76
-	md5sums = 679dbd817343d459252225000d71ec52
+	source = 60-dracut-remove.hook
+	sha256sums = 9b0bf68c913b191a3837f664cb566e8eaa486c0b9cdf11cfa6edd5b5001c7af1
+	sha256sums = 25409770cdf9607eb05addcbc0f89f45a91385c25b8a307425d4b3f4b7c2a9ef
+	sha256sums = 439c5caa6e4487faa7238869fe08ceedbd9297208f1fe5286cb816364533a4ea
+	sha256sums = 054dac9f1d55029a922ff05c3064e54d25790c7a18d2b598edc58ef3d295cba1
 
 pkgname = dracut-hook
 
diff --git a/90-dracut-remove.hook b/60-dracut-remove.hook
index d114bf2eb98e..80a9c1e4985e 100644
--- a/90-dracut-remove.hook
+++ b/60-dracut-remove.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Remove
 Target = usr/lib/modules/*/pkgbase
 
@@ -7,4 +7,4 @@ Target = usr/lib/modules/*/pkgbase
 Description = Removing linux initcpios...
 When = PreTransaction
 Exec = /usr/share/libalpm/scripts/dracut-remove
-NeedsTargets
\ No newline at end of file
+NeedsTargets
diff --git a/90-dracut-install.hook b/90-dracut-install.hook
index 8af2237a75dc..83545a08752f 100644
--- a/90-dracut-install.hook
+++ b/90-dracut-install.hook
@@ -1,8 +1,8 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
-Target = usr/lib/modules/*/vmlinuz
+Target = usr/lib/modules/*/pkgbase
 Target = usr/lib/dracut/*
 
 [Action]
diff --git a/PKGBUILD b/PKGBUILD
index 25ccec3857e0..97f7efb8da93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Franklyn Tackitt <franklyn@tackitt.net>
+# Maintainer: Kevin Del Castillo <quebin31@gmail.com>
 
-pkgname="dracut-hook"
-pkgver=0.3
-pkgrel=2
-pkgdesc="dracut hook for archlinux"
+pkgname=dracut-hook
+pkgver=0.4
+pkgrel=1
+pkgdesc="Install/remove hooks for dracut"
+url=https://dracut.wiki.kernel.org/index.php/Main_Page
 arch=('any')
-url="https://tackitt.net"
 license=('BSD')
 depends=('dracut')
 noextract=()
@@ -13,16 +14,16 @@ source=(
   "dracut-install"
   "dracut-remove"
   "90-dracut-install.hook"
-  "90-dracut-remove.hook"
+  "60-dracut-remove.hook"
 )
-md5sums=('ca2782fe7bd5e5ec01ba1043df8db092'
-         'd47474311fe65faf9358727f75526389'
-         '8fa0ed0a9aa50f2ac6525d3264f04d76'
-         '679dbd817343d459252225000d71ec52')
+sha256sums=('9b0bf68c913b191a3837f664cb566e8eaa486c0b9cdf11cfa6edd5b5001c7af1'
+            '25409770cdf9607eb05addcbc0f89f45a91385c25b8a307425d4b3f4b7c2a9ef'
+            '439c5caa6e4487faa7238869fe08ceedbd9297208f1fe5286cb816364533a4ea'
+            '054dac9f1d55029a922ff05c3064e54d25790c7a18d2b598edc58ef3d295cba1')
 
 package() {
-  install -Dm755 "$srcdir/90-dracut-install.hook" "${pkgdir}/usr/share/libalpm/hooks/90-dracut-install.hook"
-  install -Dm755 "$srcdir/90-dracut-remove.hook" "${pkgdir}/usr/share/libalpm/hooks/90-dracut-remove.hook"
-  install -Dm755 "$srcdir/dracut-install"         "${pkgdir}/usr/share/libalpm/scripts/dracut-install"
-  install -Dm755 "$srcdir/dracut-remove"         "${pkgdir}/usr/share/libalpm/scripts/dracut-remove"
+  install -Dm644 "${srcdir}/90-dracut-install.hook" "${pkgdir}/usr/share/libalpm/hooks/90-dracut-install.hook"
+  install -Dm644 "${srcdir}/60-dracut-remove.hook"  "${pkgdir}/usr/share/libalpm/hooks/60-dracut-remove.hook"
+  install -Dm755 "${srcdir}/dracut-install"         "${pkgdir}/usr/share/libalpm/scripts/dracut-install"
+  install -Dm755 "${srcdir}/dracut-remove"          "${pkgdir}/usr/share/libalpm/scripts/dracut-remove"
 }
diff --git a/dracut-install b/dracut-install
index 037e3a02e8e1..771f5267a830 100755
--- a/dracut-install
+++ b/dracut-install
@@ -1,38 +1,36 @@
 #!/bin/bash -e
 
 kernels=()
-all=0
-
+dracut_update=0
 
 while read -r line; do
-	if [[ $line != */vmlinuz ]]; then
-		all=1
-		continue
-	fi
+    if [[ $line != 'usr/lib/modules'+([^/])'/pkgbase' ]]; then
+		dracut_update=1 # Dracut files have been updated
+        continue 
+    fi
 
-	if ! read -r pkgbase > /dev/null 2>&1 < "${line%/vmlinuz}/pkgbase"; then
-		continue
-	fi
-				
-	install -Dm644 "${line}" "/boot/vmlinuz-${pkgbase}"
+    read -r pkgbase < "/${line}"
 	kernels+=("${pkgbase}")
 done
 
-if (( all )); then
+if (( dracut_update )); then
 	kernels=()
 	for file in /lib/modules/*/pkgbase; do
-		if read -r pkgbase > /dev/null 2>&1 < "$file"; then
+		if read -r pkgbase &> /dev/null < "$file"; then
 			kernels+=("${pkgbase}")
 		fi
 	done
 fi
 
 for kernel in "${kernels[@]}"; do
-	pkgbase="$(grep -lE "^${kernel}\$" /lib/modules/*/pkgbase)"
-	modules=$(basename "${pkgbase%/pkgbase}")
+	path="$(grep -lE "^${kernel}\$" /usr/lib/modules/*/pkgbase)"
+	version=$(basename "${path%/pkgbase}")
+    read -r pkgbase < "$path"
 
-	echo "Building dracut for $kernel - $modules"
+    install -Dm0644 "/${path%'/pkgbase'}/vmlinuz" "/boot/vmlinuz-${pkgbase}"
 
-	dracut -f -H --no-hostonly-cmdline "/boot/initramfs-${kernel}.img" "${modules}"
-	dracut -f -N "/boot/initramfs-${kernel}-fallback.img" "${modules}"
+	echo ":: Building initramfs for $kernel-$version"
+	dracut -f --no-hostonly-cmdline "/boot/initramfs-${kernel}.img" --kver "${version}"
+	echo ":: Building fallback initramfs for $kernel-$version"
+	dracut -f -N "/boot/initramfs-${kernel}-fallback.img" --kver "${version}"
 done
diff --git a/dracut-remove b/dracut-remove
index af350c7f6df6..af350c7f6df6 100644..100755
--- a/dracut-remove
+++ b/dracut-remove