From 67cdf267212f8213c8e5310627015f56fb02de16 Mon Sep 17 00:00:00 2001
From: srs5694 <srs5694@users.sourceforge.net>
Date: Mon, 2 Feb 2015 12:49:23 -0500
Subject: [PATCH] Fixed OS X install.sh bugs relating to pre-mounted ESP with
 space in path and disks with partition numbers above 10.

---
 NEWS.txt              | 10 ++++++++++
 docs/refind/todo.html |  4 ++++
 install.sh            |  7 +++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index f596f8f..f356e9a 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,13 @@
+0.8.6 (?/??/2016):
+------------------
+
+- Fixed install.sh bug that caused misidentification of installation
+  directory under OS X if an already-mounted ESP has spaces in its path.
+
+- Fixed install.sh bug that could cause misidentification of the ESP on
+  disks with partition numbers of 10 or above.
+
+
 0.8.5 (2/1/2015):
 -----------------
 
diff --git a/docs/refind/todo.html b/docs/refind/todo.html
index 8838bae..33f5613 100644
--- a/docs/refind/todo.html
+++ b/docs/refind/todo.html
@@ -336,6 +336,10 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 	detected boot programs and create a set of manual boot stanzas for
 	them, so that they can be modified manually.</li>
 
+    <li>Support for touchscreens and/or configurable buttons for rEFInd's
+	actions would enable use of rEFInd on tablet computers that lack
+	complete keyboards.</li>
+
     <li>GRUB provides a configuration-file command called <tt>outb</tt>
 	that enables manipulating hardware registers. Something similar,
 	via the <tt>mm</tt> command, can be done in the EFI shell. I'd like
diff --git a/install.sh b/install.sh
index 437fa3c..a95d30e 100755
--- 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
-- 
2.39.2