diff --git a/srcpkgs/refind/files/kernel.post-install b/srcpkgs/refind/files/kernel.post-install index 20dd149a807..79de537a5f5 100755 --- a/srcpkgs/refind/files/kernel.post-install +++ b/srcpkgs/refind/files/kernel.post-install @@ -19,21 +19,31 @@ zrefind_dir="${REFIND_CONF%/*}" mkdir -p "$zrefind_dir" touch "$REFIND_CONF" +tmpfile=$(mktemp /tmp/refind.XXXXXXX) + zefi_mountpoint=$(df -P "$REFIND_CONF" | awk 'NR==2{print $6}') zicon="${zrefind_dir#$zefi_mountpoint}/icons/os_void.png" -mkedscript() { - zversion=$(echo $VERSION | sed 's/[.]/[.]/g') - zexpr='^menuentry "Void Linux '"$zversion"'" {$' - if grep -q "$zexpr" "$REFIND_CONF"; then - # Do not merge into /expr/,/}/d, it doesn't work - printf '%s\n' "/$zexpr/" '.,/}/d' - fi - - cat <"$tmpfile" + +mv "$tmpfile" "$REFIND_CONF" -mkedscript | ed "$REFIND_CONF" >/dev/null exit 0 diff --git a/srcpkgs/refind/files/kernel.post-remove b/srcpkgs/refind/files/kernel.post-remove index 98ff754f570..8a7eee33729 100755 --- a/srcpkgs/refind/files/kernel.post-remove +++ b/srcpkgs/refind/files/kernel.post-remove @@ -21,8 +21,4 @@ tmpfile=$(mktemp /tmp/refind.XXXXXXX) zversion=$(echo $VERSION | sed 's/[.]/[.]/g') sed "/^menuentry \"Void Linux $zversion\" [{]\$/,/[}]/d" "$REFIND_CONF" >"$tmpfile" -if ! cmp -s "$REFIND_CONF" "$tmpfile"; then - mv "$tmpfile" "$REFIND_CONF" -else - rm -f "$tmpfile" -fi +mv "$tmpfile" "$REFIND_CONF" diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template index 55bda995204..73cb28fc3e7 100644 --- a/srcpkgs/refind/template +++ b/srcpkgs/refind/template @@ -1,7 +1,7 @@ # Template file for 'refind' pkgname=refind version=0.11.4 -revision=2 +revision=3 makedepends="gnu-efi-libs git" depends="bash dosfstools efibootmgr" short_desc="EFI boot manager utility"