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

diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index 52fab3d..d77b8b0
--- a/install.sh
+++ b/install.sh
@@ -17,6 +17,9 @@
 #
 # 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
 # 0.3.2.1 -- Check for presence of source files; aborts if not present
 # 0.3.2   -- Initial version
@@ -59,7 +62,6 @@ CheckForFiles() {
    else
       echo "The icons directory is missing! Aborting installation!"
    fi
-#|| ! -f $RefindDir/refind.conf-sample || ! -d $RefindDir/icons
 } # CheckForFiles()
 
 # Copy the rEFInd files to the ESP or OS X root partition.
@@ -124,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`
@@ -161,11 +163,29 @@ InstallOnOSX() {
    if [[ $? != 0 ]] ; then
       Problems=1
    fi
+   if [[ -f /Library/StartupItems/rEFItBlesser || -d /Library/StartupItems/rEFItBlesser ]] ; then
+      echo
+      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 -r /Library/StartupItems/rEFItBlesser
+      else
+         echo "Not deleting rEFItBlesser."
+      fi
+   fi
    echo
    echo "WARNING: If you have an Advanced Format disk, *DO NOT* attempt to check the"
    echo "bless status with 'bless --info', since this is known to cause disk corruption"
    echo "on some systems!!"
    echo
+   echo "NOTE: If you want to boot an OS via BIOS emulation (such as Windows or some"
+   echo "Linux installations), you *MUST* edit the $InstallPart/$TargetDir/refind.conf"
+   echo "file's 'scanfor' line to include the 'hdbios' option, and perhaps"
+   echo "'biosexternal' and 'cd', as well."
+   echo
 } # InstallOnOSX()
 
 
@@ -191,6 +211,7 @@ FindLinuxESP() {
 # Uses efibootmgr to add an entry for rEFInd to the EFI's NVRAM.
 # If this fails, sets Problems=1
 AddBootEntry() {
+   InstallIt="0"
    Efibootmgr=`which efibootmgr 2> /dev/null`
    if [[ $Efibootmgr ]] ; then
       modprobe efivars &> /dev/null
@@ -198,17 +219,27 @@ AddBootEntry() {
       PartNum=`grep $InstallPart /etc/mtab | cut -d " " -f 1 | cut -c 9-10`
       EntryFilename=$TargetDir/$Refind
       EfiEntryFilename=`echo ${EntryFilename//\//\\\}`
-      ExistingEntry=`$Efibootmgr -v | grep $Refind`
+      EfiEntryFilename2=`echo ${EfiEntryFilename} | sed s/\\\\\\\\/\\\\\\\\\\\\\\\\/g`
+      ExistingEntry=`$Efibootmgr -v | grep $EfiEntryFilename2`
       if [[ $ExistingEntry ]] ; then
-         echo "An existing EFI boot manager entry for rEFInd seems to exist:"
-         echo
-         echo "$ExistingEntry"
-         echo
-         echo "This entry is NOT being modified, and no new entry is being created."
+         ExistingEntryBootNum=`echo $ExistingEntry | cut -c 5-8`
+         FirstBoot=`$Efibootmgr | grep BootOrder | cut -c 12-15`
+         if [[ $ExistingEntryBootNum != $FirstBoot ]] ; then
+            echo "An existing rEFInd boot entry exists, but isn't set as the default boot"
+            echo "manager. The boot order is being adjusted to make rEFInd the default boot"
+            echo "manager. If this is NOT what you want, you should use efibootmgr to"
+            echo "manually adjust your EFI's boot order."
+            $Efibootmgr -b $ExistingEntryBootNum -B &> /dev/null
+	    InstallIt="1"
+         fi
       else
+         InstallIt="1"
+      fi
+      if [[ $InstallIt == "1" ]] ; then
+         echo "Installing it!"
          $Efibootmgr -c -l $EfiEntryFilename -L rEFInd -d $InstallDisk -p $PartNum &> /dev/null
          if [[ $? != 0 ]] ; then
-	    EfibootmgrProblems=1
+            EfibootmgrProblems=1
             Problems=1
          fi
       fi