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"