From 0d46f46ed7a2d453c9320469f211c5348120a1cd Mon Sep 17 00:00:00 2001
From: Rod Smith <rodsmith@rodsbooks.com>
Date: Apr 12 2022 17:32:35 +0000
Subject: Fixed two refind-install bugs; no changes to the rEFInd binary itself


---

diff --git a/NEWS.txt b/NEWS.txt
index e5af291..25cbff7 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,8 +1,11 @@
-0.13.4 (?/??/2022):
+0.13.3.1 (4/12/2022):
 -------------------
 
 - Fixed bug that caused refind-install to not recognize already-mounted
-  ESP.
+  ESP in Linux. This was causing installation failures on some systems.
+
+- Fixed bug in refind-install that caused duplicate EFI boot manager
+  entries when updating a rEFInd installation that used Shim.
 
 0.13.3 (4/10/2022):
 -------------------
diff --git a/debian/changelog b/debian/changelog
index 7d73909..7cc1689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+refind (0.13.3.1-0ppa1) focal; urgency=medium
+
+  * Version bump
+
+ -- Roderick Smith <rodsmith@rodsbooks.com>  Tue, 12 Apr 2022 13:08:23 -0400
+
 refind (0.13.3-0ppa1) focal; urgency=medium
 
   * Version bump
diff --git a/docs/refind/getting.html b/docs/refind/getting.html
index 2696f9d..14e55cb 100644
--- a/docs/refind/getting.html
+++ b/docs/refind/getting.html
@@ -17,7 +17,7 @@
 href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 
 <p>Originally written: 3/14/2012; last Web page update:
-4/10/2022, referencing rEFInd 0.13.3</p>
+4/12/2022, referencing rEFInd 0.13.3.1</p>
 
 <p>This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!</p>
 
@@ -132,7 +132,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 <ul>
 
 <li><b><a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-bin-0.13.3.zip/download">A
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-bin-0.13.3.1.zip/download">A
     binary zip file</a></b>&mdash;Download this file if you want to install
     rEFInd and/or its filesystem drivers on an <i>x</i>86, <i>x</i>86-64, or
     ARM64 computer and have no need to test rEFInd first by booting it on an
@@ -144,13 +144,13 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
     users of Arch
     Linux have reported problems booting some specific Arch Linux kernels
     with rEFInd and some other tools. For them, a <a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-bin-gnuefi-0.13.3.zip/download">variant
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-bin-gnuefi-0.13.3.1.zip/download">variant
     package</a> exists in which the <i>x</i>86-64 binary was compiled with
     GNU-EFI rather than the usual TianoCore EDK2. This change helps some
     users with this problem.</li>
 
 <li><b><a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-0.13.3-1.x86_64.rpm/download">A
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-0.13.3.1-1.x86_64.rpm/download">A
     binary RPM file</a></b>&mdash;If you use an RPM-based <i>x</i>86-64
     Linux system such as Fedora or openSUSE, you can install the binary RPM
     package rather than use the binary zip file. (I don't provide
@@ -158,13 +158,13 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
     <tt>refind-install</tt> script (described on the <a
     href="installing.html">Installing and Uninstalling rEFInd</a> page) as
     part of the installation process. The <a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-0.13.3-1.src.rpm/download">source
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-0.13.3.1-1.src.rpm/download">source
     RPM file</a> might or might not build on your system as-is; it relies
     on assumptions about the locations of the GNU-EFI development
     files.</li>
 
 <li><b><a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind_0.13.3-1_amd64.deb/download">A
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind_0.13.3.1-1_amd64.deb/download">A
     binary Debian package</a></b>&mdash;If you use an <i>x</i>86-64 version
     of Debian, Ubuntu, Mint, or another Debian-based distribution, you can
     install from this package, which was converted from the binary RPM
@@ -175,7 +175,7 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 <p class="sidebar"><b>Note:</b> At the moment, neither the bootable CD-R image file nor the bootable USB flash drive image file supports booting with Secure Boot active. The x86-64 version of the <a href="http://en.altlinux.org/Rescue">ALT Linux Rescue disc</a> uses a Secure Boot-enabled rEFInd, though, so you may find that useful in some situations.</p>
 
 <li><b><a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-cd-0.13.3.zip/download">A
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-cd-0.13.3.1.zip/download">A
     CD-R image file</a></b>&mdash;This download contains the same files as
     the binary zip file, but you can burn it to a CD-R to test rEFInd
     (and its filesystem drivers) without installing it first. (It boots on
@@ -199,7 +199,7 @@ first partition on <tt>/dev/sdd</tt>. This procedure should work even on a
 BIOS-booted computer.</p>
 
 <li><b><a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-flashdrive-0.13.3.zip/download">A
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-flashdrive-0.13.3.1.zip/download">A
     USB flash drive image file</a></b>&mdash;Although you can create your
     own rEFInd USB flash drive using the binary <tt>.zip</tt> file and its
     <tt>refind-install</tt> script, you may find it easier to download this
@@ -207,7 +207,7 @@ BIOS-booted computer.</p>
     low-level disk copying utility.</li>
 
 <li><b><a
-    href="http://sourceforge.net/projects/refind/files/0.13.3/refind-src-0.13.3.tar.gz/download">A
+    href="http://sourceforge.net/projects/refind/files/0.13.3.1/refind-src-0.13.3.1.tar.gz/download">A
     source code tarball</a></b>&mdash;This is useful if you want to compile
     the software locally. Note that I use Linux with the <a
     href="https://sourceforge.net/projects/tianocore/">TianoCore EFI
diff --git a/docs/refind/revisions.html b/docs/refind/revisions.html
index 524165e..35dc0f9 100644
--- a/docs/refind/revisions.html
+++ b/docs/refind/revisions.html
@@ -16,7 +16,7 @@
 <p class="subhead">by Roderick W. Smith, <a
 href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 
-<p>Last Web page update: 4/10/2022</p>
+<p>Last Web page update: 4/12/2022</p>
 
 <p>This Web page is provided free of charge and with no annoying outside ads; however, I did take time to prepare it, and Web hosting does cost money. If you find this Web page useful, please consider making a small donation to help keep this site up and running. Thanks!</p>
 
@@ -126,6 +126,8 @@ href="mailto:rodsmith@rodsbooks.com">rodsmith@rodsbooks.com</a></p>
 
 <ul>
 
+<li><b>0.13.3.1 (4/12/2022)</b>&mdash;This is a minor update to address two bugs in the <tt>refind-install</tt> script. The first bug caused it to fail to identify a mounted ESP in Linux. This in turn could cause package installation problems. The second bug caused <tt>refind-install</tt> to fail to re-use an existing EFI boot manager entry for rEFInd when the system was booting through Shim, thus creating duplicated entries. There are no changes to the rEFInd program itself with this version (although it's a fresh build from source).</li>
+
 <li><b>0.13.3 (4/10/2022)</b>&mdash;This version features several minor bug fixes and new features:
 
 <ul>
diff --git a/refind-install b/refind-install
index 64fb31b..dfb8781 100755
--- a/refind-install
+++ b/refind-install
@@ -38,6 +38,7 @@
 
 # Revision history:
 #
+# 0.13.3.1-- Fix bug that caused failure to detect mounted ESP in Linux
 # 0.13.3  -- Remove stray exit from CreateBootCsvFile()
 # 0.13.2  -- Add installation of rEFInd Secure Boot key as MOK; if installing
 #            with Shim, add backup direct boot NVRAM option
@@ -1292,7 +1293,7 @@ AddBootEntry() {
       fi
       EntryFilename="$TargetDir/$Refind"
       EfiEntryFilename=`echo ${EntryFilename//\//\\\}`
-      EfiEntryFilename2=$(echo "${EfiEntryFilename}" | sed s/\\\\\\\\/\\\\\\\\\\\\\\\\/g)
+      EfiEntryFilename2=`echo "${EfiEntryFilename}" | sed s/\\\\\\\\/\\\\\\\\\\\\\\\\/g`
       InstallPartGuid=$(blkid -s PARTUUID -o value "$InstallPart")
       FirstBoot=$("$Efibootmgr" | grep BootOrder | cut -c 12-15)
       ExistingEntry=$("$Efibootmgr" -v | grep -i "$EfiEntryFilename2" | grep -i "$InstallPartGuid" | head -n 1)
diff --git a/refind.spec b/refind.spec
index 82356af..1d8025a 100644
--- a/refind.spec
+++ b/refind.spec
@@ -1,6 +1,6 @@
 Summary: EFI boot manager software
 Name: refind
-Version: 0.13.3
+Version: 0.13.3.1
 Release: 1%{?dist}
 Summary: EFI boot manager software
 License: GPLv3
@@ -176,6 +176,8 @@ fi
 # thus wiping out the just-updated files.
 
 %changelog
+* Tue Apr 12 2022 R Smith <rodsmith@rodsbooks.com> - 0.13.3.1
+- Updated spec file for 0.13.3
 * Sun Apr 10 2022 R Smith <rodsmith@rodsbooks.com> - 0.13.3
 - Updated spec file for 0.13.3
 * Sat Mar 13 2021 R Smith <rodsmith@rodsbooks.com> - 0.13.2