From da6118b6a048ea1b712c2c09d09de5a7a268d2b1 Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Sun, 28 Feb 2021 09:58:49 +0100
Subject: [PATCH] fix: find_oldest and find_newest fixes

---
 drive.inc      | 28 ++++++++++++----------------
 tests/drive.sh |  4 ++--
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/drive.inc b/drive.inc
index 64f4121..290e130 100644
--- a/drive.inc
+++ b/drive.inc
@@ -53,28 +53,24 @@ function find_oldest
 {
     local drive="$1"
     oldest="$(parted -m "$drive" -- print|awk -F: \
-        'BEGIN 
-            {min="ZZZZ"}
-            {if (NR > 2 && $1 >= 2 && $1 <= 4 &&
-                           $6 < min && $6 != "root unused") {
-                min=$6; part=$1
-            }}
-        END
-        {print part}')"
+        'BEGIN {min="zzzzz"}
+         {if (NR > 2 && $1 >= 2 && $1 <= 4 &&
+                        $6 < min && $6 != "root unused") {
+             min=$6; part=$1
+         }}
+         END {print part}')"
 }
 
 function find_newest
 {
     local drive="$1"
     newest="$(parted -m "$drive" -- print|awk -F: \
-        'BEGIN
-            {max=""}
-             {if (NR > 2 && $1 >= 2 && $1 <= 4 && 
-                            $6 > max && $6 != "root unused") {
-                 max=$6; part=$1
-             }}
-         END
-         {print part}')"
+        'BEGIN {max=""}
+         {if (NR > 2 && $1 >= 2 && $1 <= 4 && 
+                        $6 > max && $6 != "root unused") {
+             max=$6; part=$1
+         }}
+         END {print part}')"
 }
 
 function version_from_partnum
diff --git a/tests/drive.sh b/tests/drive.sh
index 40a2a93..9b51856 100755
--- a/tests/drive.sh
+++ b/tests/drive.sh
@@ -28,13 +28,13 @@ function test_partitioning()
 
     rename_partition "$img" 3 "root $min_version"
     find_oldest "$img"
-    assertEquals "find_oldest" "$min_version" "$oldest"
+    assertEquals "find_oldest" 3 "$oldest"
     version_from_partnum "$img" 3
     assertEquals "version_from partnum 3" "$min_version" "$version"
 
     rename_partition "$img" 4 "root $max_version"
     find_newest "$img"
-    assertEquals "find_newest" "$max_version" "$newest"
+    assertEquals "find_newest" 4 "$newest"
     version_from_partnum "$img" 4
     assertEquals "version_from_partnum 4" "$max_version" "$version"