Reverted rEFIt commit r472, since it's caused some existing BMP

[refind] / install.sh

diff --git a/install.sh b/install.sh
index 437fa3c48c626a3b02b6ba9a873379fcd6cc1103..a95d30ee9d6c0a32872512542985f21a89f5b029 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -35,6 +35,9 @@
 #
 # Revision history:
 #
+# 0.8.6   -- Fixed bugs that caused misidentification of ESP on disks with
+#            partition numbers over 10 on OS X and misidentification of mount
+#            point if already-mounted ESP had space in path.
 # 0.8.5   -- Refinement/cleanup of new OS X ESP-as-default policy
 # 0.8.4   -- OS X default changed to install to ESP under /EFI/BOOT
 # 0.7.9   -- Fixed bug that caused errors if dmraid utility not installed
@@ -599,8 +602,8 @@ MountOSXESP() {
    fi
    Esp=/dev/`echo $Temp`
    # If the ESP is mounted, use its current mount point....
-   Temp=`df -P | grep "$Esp"`
-   InstallDir=`echo $Temp | cut -f 6 -d ' '`
+   Temp=`df -P | grep "$Esp "`
+   InstallDir=`echo $Temp | cut -f 6- -d ' '`
    if [[ "$InstallDir" == '' ]] ; then
       mkdir /Volumes/ESP &> /dev/null
       mount -t msdos "$Esp" /Volumes/ESP