script cleanup

Author: me-no-dev

tools/ci/install-arduino-ide.sh

@@ -146,6 +146,7 @@ function build_sketches() # build_sketches <examples-path> <fqbn> <chunk> <total
     count_sketches "$examples"
     local sketchcount=$?
     local sketches=$(cat sketches.txt)
+    rm -rf sketches.txt
 
     local chunk_size=$(( $sketchcount / $chunks_num ))
     local all_chunks=$(( $chunks_num * $chunk_size ))
@@ -176,21 +177,13 @@ function build_sketches() # build_sketches <examples-path> <fqbn> <chunk> <total
         local sketchdir=$(dirname $sketch)
         local sketchdirname=$(basename $sketchdir)
         local sketchname=$(basename $sketch)
-        if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
-            #echo "Skipping $sketch, beacause it is not the main sketch file";
-            continue
-        fi;
-        if [[ -f "$sketchdir/.test.skip" ]]; then
-            #echo "Skipping $sketch marked";
+        if [ "${sketchdirname}.ino" != "$sketchname" ] \
+        || [ -f "$sketchdir/.test.skip" ]; then
             continue
         fi
         sketchnum=$(($sketchnum + 1))
-        if [ "$sketchnum" -le "$start_index" ]; then
-        	#echo "Skipping $sketch index low"
-        	continue
-        fi
-        if [ "$sketchnum" -gt "$end_index" ]; then
-        	#echo "Skipping $sketch index high"
+        if [ "$sketchnum" -le "$start_index" ] \
+        || [ "$sketchnum" -gt "$end_index" ]; then
         	continue
         fi
         build_sketch "$fqbn" "$sketch" "$xtra_opts"

tools/ci/install-platformio-esp32.sh

@@ -71,7 +71,6 @@ function build_pio_sketches() # build_pio_sketches <examples-path> <board> <chun
     local board=$2
     local chunk_idex=$3
     local chunks_num=$4
-    local xtra_opts=$5
 
 	if [ "$chunks_num" -le 0 ]; then
 		echo "ERROR: Chunks count must be positive number"
@@ -85,6 +84,7 @@ function build_pio_sketches() # build_pio_sketches <examples-path> <board> <chun
     count_sketches "$examples"
     local sketchcount=$?
     local sketches=$(cat sketches.txt)
+    rm -rf sketches.txt
 
     local chunk_size=$(( $sketchcount / $chunks_num ))
     local all_chunks=$(( $chunks_num * $chunk_size ))
@@ -115,21 +115,13 @@ function build_pio_sketches() # build_pio_sketches <examples-path> <board> <chun
         local sketchdir=$(dirname $sketch)
         local sketchdirname=$(basename $sketchdir)
         local sketchname=$(basename $sketch)
-        if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
-            #echo "Skipping $sketch, beacause it is not the main sketch file";
-            continue
-        fi;
-        if [[ -f "$sketchdir/.test.skip" ]]; then
-            #echo "Skipping $sketch marked";
+        if [ "${sketchdirname}.ino" != "$sketchname" ] \
+        || [ -f "$sketchdir/.test.skip" ]; then
             continue
         fi
         sketchnum=$(($sketchnum + 1))
-        if [ "$sketchnum" -le "$start_index" ]; then
-        	#echo "Skipping $sketch index low"
-        	continue
-        fi
-        if [ "$sketchnum" -gt "$end_index" ]; then
-        	#echo "Skipping $sketch index high"
+        if [ "$sketchnum" -le "$start_index" ] \
+        || [ "$sketchnum" -gt "$end_index" ]; then
         	continue
         fi
         build_pio_sketch "$board" "$sketch"

tools/ci/on-push.sh

@@ -51,6 +51,6 @@ else
 	python -m platformio ci  --board esp32dev libraries/BLE/examples/BLE_server && \
 	python -m platformio ci  --board esp32dev libraries/AzureIoT/examples/GetStarted && \
 	python -m platformio ci  --board esp32dev libraries/ESP32/examples/Camera/CameraWebServer --project-option="board_build.partitions = huge_app.csv"
-	#build_pio_sketches libraries "esp32dev" "$CHUNK_INDEX" "$CHUNKS_CNT"
+	#build_pio_sketches libraries esp32dev $CHUNK_INDEX $CHUNKS_CNT
 	if [ $? -ne 0 ]; then exit 1; fi
 fi