Increment version and improve build_all.sh

ThomasFarstrike · ThomasFarstrike · commit d68650c644da · 2025-10-20T18:07:23.000+02:00
diff --git a/internal_filesystem/lib/mpos/info.py b/internal_filesystem/lib/mpos/info.py
@@ -1,4 +1,4 @@
-CURRENT_OS_VERSION = "0.1.2"
+CURRENT_OS_VERSION = "0.2.0"
 
 # Unique string that defines the hardware, used by OSUpdate and the About app
 _hardware_id = "missing-hardware-info"
diff --git a/scripts/build_all.sh b/scripts/build_all.sh
@@ -5,19 +5,29 @@ updatesdir=../updates/
 buildfile="$builddir"/lvgl_micropy_ESP32_GENERIC_S3-SPIRAM_OCT-16.bin
 updatefile=../lvgl_micropython/lib/micropython/ports/esp32/build-ESP32_GENERIC_S3-SPIRAM_OCT/micropython.bin
 
+version=$(grep CURRENT_OS_VERSION internal_filesystem/lib/mpos/info.py  | cut -d "=" -f 2 | tr -d " " | tr -d '"')
+
+overwrite="$1"
+if [ "$overwrite" != "--overwrite" ] && ls "$outdir"/*"$version"* 2>/dev/null; then
+	echo "WARNING: $version already exists, use --overwrite to overwrite it"
+	exit 1
+fi
+
+exit 0
+
 ./scripts/build_lvgl_micropython.sh esp32 prod fri3d-2024
-cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_prod
-cp "$updatefile" "$updatesdir"/MicroPythonOS_fri3d-2024_prod.ota
+cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_prod_"$version".bin
+cp "$updatefile" "$updatesdir"/MicroPythonOS_fri3d-2024_prod_"$version".ota
 
 ./scripts/build_lvgl_micropython.sh esp32 dev fri3d-2024
-cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_dev
+cp "$buildfile" "$outdir"/MicroPythonOS_fri3d-2024_dev_"$version".bin
 
 ./scripts/build_lvgl_micropython.sh esp32 prod waveshare-esp32-s3-touch-lcd-2
-cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod
-cp "$updatefile" "$updatesdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod.ota
+cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_"$version".bin
+cp "$updatefile" "$updatesdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_prod_"$version".ota
 
 ./scripts/build_lvgl_micropython.sh esp32 dev waveshare-esp32-s3-touch-lcd-2
-cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev
+cp "$buildfile" "$outdir"/MicroPythonOS_waveshare-esp32-s3-touch-lcd-2_dev_"$version".bin
 
 ./scripts/build_lvgl_micropython.sh unix dev
-cp "$builddir"/lvgl_micropy_unix "$outdir"/MicroPythonOS_amd64_Linux
+cp "$builddir"/lvgl_micropy_unix "$outdir"/MicroPythonOS_amd64_linux_"$version".elf

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CURRENT_OS_VERSION = "0.1.2"`
	`1`	`+CURRENT_OS_VERSION = "0.2.0"`
`2`	`2`
`3`	`3`	`# Unique string that defines the hardware, used by OSUpdate and the About app`
`4`	`4`	`_hardware_id = "missing-hardware-info"`