X-Git-Url: https://code.delx.au/refind/blobdiff_plain/d6ff33695cf6d7f337705fc4a842c56ce6e5a05e..7c898f4a26b66344e4cc8ed5c2e272d5ea0a71dc:/install.sh

diff --git a/install.sh b/install.sh
index 961c90c..d77b8b0 100644
--- a/install.sh
+++ b/install.sh
@@ -17,6 +17,7 @@
 #
 # Revision history:
 #
+# 0.4.5   -- Fixed check for rEFItBlesser in OS X
 # 0.4.2   -- Added notice about BIOS-based OSes & made NVRAM changes in Linux smarter
 # 0.4.1   -- Added check for rEFItBlesser in OS X
 # 0.3.3.1 -- Fixed OS X 10.7 bug; also works as make target
@@ -125,7 +126,7 @@ CopyRefindFiles() {
 MountOSXESP() {
    # Identify the ESP. Note: This returns the FIRST ESP found;
    # if the system has multiple disks, this could be wrong!
-   Temp=`diskutil list | grep EFI`
+   Temp=`diskutil list | grep " EFI "`
    Esp=/dev/`echo $Temp | cut -f 5 -d ' '`
    # If the ESP is mounted, use its current mount point....
    Temp=`df | grep $Esp`
@@ -162,15 +163,15 @@ InstallOnOSX() {
    if [[ $? != 0 ]] ; then
       Problems=1
    fi
-   if [[ -f /Library/StartupItems/rEFItBlesser ]] ; then
+   if [[ -f /Library/StartupItems/rEFItBlesser || -d /Library/StartupItems/rEFItBlesser ]] ; then
       echo
-      echo "/Library/StartupItems/rEFItBlesser file found!"
+      echo "/Library/StartupItems/rEFItBlesser found!"
       echo "This program is part of rEFIt, and will cause rEFInd to fail to work after"
       echo -n "its first boot. Do you want to remove rEFItBlesser (Y/N)? "
       read YesNo
       if [[ $YesNo == "Y" || $YesNo == "y" ]] ; then
          echo "Deleting /Library/StartupItems/rEFItBlesser..."
-	 rm /Library/StartupItems/rEFItBlesser
+	 rm -r /Library/StartupItems/rEFItBlesser
       else
          echo "Not deleting rEFItBlesser."
       fi