From 68d16126132c65ed7668b54534370ce57e192e2b Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Mon, 13 Oct 2025 18:47:51 +0200 Subject: [PATCH] Remove absolute paths, including ~ --- scripts/build_lvgl_micropython.sh | 4 ++-- scripts/freezefs_mount_builtin.sh | 6 ++++-- scripts/install.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/build_lvgl_micropython.sh b/scripts/build_lvgl_micropython.sh index 52360ee8..91402a8d 100755 --- a/scripts/build_lvgl_micropython.sh +++ b/scripts/build_lvgl_micropython.sh @@ -55,7 +55,7 @@ if [ "$target" == "esp32" ]; then [ ! -z "$manifest" ] && frozenmanifest="FROZEN_MANIFEST="$(readlink -f "$manifest") twoup=$(readlink -f "$mydir"/../..) # build process needs absolute paths oneup=$(readlink -f "$mydir"/..) # build process needs absolute paths - pushd ~/projects/MicroPythonOS/lvgl_micropython + pushd "$twoup"/lvgl_micropython python3 make.py --ota --partition-size=4194304 --flash-size=16 esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=st7789 INDEV=cst816s USER_C_MODULE="$twoup"/micropython-camera-API/src/micropython.cmake USER_C_MODULE="$twoup"/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE="$oneup"/c_mpos/micropython.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y "$frozenmanifest" popd elif [ "$target" == "unix" -o "$target" == "macos" ]; then @@ -67,7 +67,7 @@ elif [ "$target" == "unix" -o "$target" == "macos" ]; then # LV_CFLAGS are passed to USER_C_MODULES # STRIP= makes it so that debug symbols are kept [ ! -z "$manifest" ] && frozenmanifest="FROZEN_MANIFEST="$(readlink -f "$manifest") - pushd ~/projects/MicroPythonOS/lvgl_micropython + pushd "$twoup"/lvgl_micropython python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest" popd else diff --git a/scripts/freezefs_mount_builtin.sh b/scripts/freezefs_mount_builtin.sh index 79994f0e..331c4c39 100755 --- a/scripts/freezefs_mount_builtin.sh +++ b/scripts/freezefs_mount_builtin.sh @@ -1,3 +1,5 @@ -pushd ~/projects/MicroPythonOS/freezeFS -python3 -m freezefs --target /builtin --on-import mount ~/projects/MicroPythonOS/MicroPythonOS/internal_filesystem/builtin freezefs_mount_builtin.py +builtindir=$(readlink -f "MicroPythonOS/internal_filesystem/builtin") + +pushd ../freezeFS/ +python3 -m freezefs --target /builtin --on-import mount "$builtindir" freezefs_mount_builtin.py popd diff --git a/scripts/install.sh b/scripts/install.sh index 069bd567..1cc84775 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -15,7 +15,7 @@ fi -mpremote=~/projects/MicroPythonOS/lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py +mpremote=$(readlink -f "../lvgl_micropython/lib/micropython/tools/mpremote/mpremote.py") pushd internal_filesystem/