From 742cb9dd77d83b51e877bb72736d97ccef843792 Mon Sep 17 00:00:00 2001
From: stefanrueger <stefan.rueger@urclocks.com>
Date: Tue, 30 Jan 2024 14:31:25 +1300
Subject: [PATCH] Update test-avrdude script

 - Simplify command to make eesave fusebit delete EEPROM on chip erase
 - Replace ${var,,} construct with tr A-Z a-z so older bash shells work
 - Make -l work for fuse access tests
---
 tools/test-avrdude | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tools/test-avrdude b/tools/test-avrdude
index 9c5a2858..862aec38 100755
--- a/tools/test-avrdude
+++ b/tools/test-avrdude
@@ -185,9 +185,9 @@ for (( p=0; p<$arraylength; p++ )); do
     # Should we test fuses?
     fusetest=1
     # Isolate part (assumes either -p part or -ppart)
-    part=$(echo ${pgm_and_target[$p]} | sed 's/  *\([^-]\)/\1/g' | tr \  \\n | grep ^-p)
+    part=$(echo ${pgm_and_target[$p]} | sed 's/  *\([^-]\)/\1/g' | tr \  \\n | grep ^-p | tr A-Z a-z)
     if [ -n "$part" ]; then
-      [[ "${nofusetest[@]}" =~ "${part,,}/" ]] && fusetest=0
+      [[ "${nofusetest[@]}" =~ "$part/" ]] && fusetest=0
     fi
 
     # Should EEPROM test be carried out?
@@ -268,17 +268,16 @@ for (( p=0; p<$arraylength; p++ )); do
         command=(${avrdude[@]} -T '"config wdton=0; config wdton=1; config wdton"')
       fi
       execute "${command[@]}" > $outfile
-      fusebit=$(awk '{print $4}' < $outfile)
-      rm $outfile
-      result [[ '"$fusebit"' == 1 '&&' ! -s $logfile ]]
+      fusebit=$(grep ^config $outfile | awk '{print $4}')
+      sed -i -e/^config/d -e/"> "/d $outfile
+      result [[ '"$fusebit"' == 1 '&&' ! -s $outfile  '&&' ! -s $logfile ]]
 
       if [ -n "$EE_SIZE" ]; then
         specify="fuse access: set eesave fusebit to delete EEPROM on chip erase"
-        command=($avrdude_bin $avrdude_conf -qq ${pgm_and_target[$p]} -cdryrun -qq -T '"config eesave"' '|'
-          ${avrdude[@]} -t)
+        command=(${avrdude[@]} -T '"config eesave=ee*erased"')
         execute "${command[@]}" > $outfile
-        rm $outfile
-        result [[ ! -s $logfile ]]
+        sed -i -e/^config/d -e/"> "/d $outfile
+        result [[ ! -s $outfile  '&&' ! -s $logfile ]]
       fi
     fi