Adjusted RPM/Debian package script to find Ubuntu's shimx64.efi, not

[refind] / refind.spec

diff --git a/refind.spec b/refind.spec
index 16c7ba0968a90bb17276265ec663bea67047bbfd..427aee6568e417637fc548adaa9390b49a0ecb96 100644 (file)
--- a/refind.spec
+++ b/refind.spec
@@ -1,6 +1,6 @@
 Summary: EFI boot manager software
 Name: refind
-Version: 0.7.2
+Version: 0.7.7
 Release: 1%{?dist}
 Summary: EFI boot manager software
 License: GPLv3
@@ -126,7 +126,9 @@ fi
 cd /usr/share/refind-%{version}
 
 declare VarFile=`ls -d /sys/firmware/efi/vars/SecureBoot* 2> /dev/null`
-declare ShimFile=`find /boot -name shim\.efi 2> /dev/null | head -n 1`
+# Note: Two find operations for ShimFile favors shim over PreLoader -- if both are
+# present, the script uses shim rather than PreLoader.
+declare ShimFile=`find /boot -name shim\.efi -o -name shimx64\.efi -o -name PreLoader\.efi 2> /dev/null | head -n 1`
 if [[ ! -n $ShimFile ]] ; then
    declare ShimFile=`find /boot -name PreLoader\.efi 2> /dev/null | head -n 1`
 fi
@@ -157,5 +159,5 @@ fi
 # wiping out the just-updated files.
 
 %changelog
-* Tue Aug 6 2013 R Smith <rodsmith@rodsbooks.com> - 0.7.2
-- Created spec file for 0.7.2 release
+* Fri Jan 3 2014 R Smith <rodsmith@rodsbooks.com> - 0.7.7
+- Created spec file for 0.7.7 release