Improvements

Author: rjtokenring

example/tools/ota/ota_mass_upload.sh

@@ -78,13 +78,17 @@ if [ $otaids == "null" ]; then
     exit 0
 fi
 
+correctlyfinished=0
 while [ $waittime -gt 0 ]; do
     echo "Waiting for $waittime seconds for OTA process to complete..."
     sleep 15
     waittime=$((waittime-15))
     # Check status of running processess...
-    otastatusout=$(arduino-cloud-cli ota status --ota-ids $otaids --format json | grep in_progress | wc -l)
-    if [ "$otastatusout" -eq 0 ]; then
+    otastatuslines=$(arduino-cloud-cli ota status --ota-ids $otaids --format json)
+    otastatusinpcnt=$(echo $otastatuslines | grep in_progress | wc -l)
+    otastatuspencnt=$(echo $otastatuslines | grep pending | wc -l)
+    if [[ $otastatusinpcnt -eq 0 && $otastatuspencnt -eq 0 ]]; then
+        correctlyfinished=1
         break   
     fi
 done
@@ -93,7 +97,7 @@ echo ""
 echo "Status report:"
 arduino-cloud-cli ota status --ota-ids $otaids
 
-if [ $waittime -le 0 ]; then
+if [ $correctlyfinished -eq 1 ]; then
     echo "OTA process did not complete within the specified time for some boards"
     exit 1
 else