diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-09-03 17:46:59 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-09-03 17:46:59 +0100 |
| commit | 09aae7be451598d920fc798aecc2efd923809cc9 (patch) | |
| tree | 6a31208277d3df3c180b5aacbdf08d03439c3da1 /script | |
| parent | 1dc54608a125a66af2900ed5f1497d7b1e168b03 (diff) | |
build/rpi-pico-serprog: better error handling
use a subshell for changing directory, and use more
verbose error messages under fault conditions
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/build/rpi-pico/serprog | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/script/build/rpi-pico/serprog b/script/build/rpi-pico/serprog index dde5070e..cd4ba84f 100755 --- a/script/build/rpi-pico/serprog +++ b/script/build/rpi-pico/serprog @@ -23,7 +23,7 @@ set -u -e . "include/err.sh" -serprog_release_dir=$(pwd)/bin/serprog +serprog_release_dir=bin/serprog sdk_dir=$(pwd)/util-fw/pico-sdk src_dir=$(pwd)/util-fw/pico-serprog @@ -34,16 +34,19 @@ main() [ -d "${src_dir}/" ] || ./update project repo rpi-pico-serprog \ || err "fetch rpi-pico-serprog failed!\n" - cd ${src_dir} - cmake -DPICO_SDK_PATH=${sdk_dir} . + ( + cd "${src_dir}" || err "can't cd to ${src_dir}" + cmake -DPICO_SDK_PATH="${sdk_dir}" . || \ + err "can't cmake ${sdk_dir}" make clean make + ) - mkdir -p ${serprog_release_dir} - mv pico_serprog.uf2 ${serprog_release_dir}/rpi-pico-serprog.uf2 \ - || err "rpi-pico serprog build failed!\n" - - printf "\nDone!\n" + mkdir -p "${serprog_release_dir}" || \ + err "can't create dir: ${serprog_release_dir}" + mv "${src_dir}/pico_serprog.uf2" \ + "${serprog_release_dir}/rpi-pico-serprog.uf2" || \ + err "rpi-pico serprog build failed!\n" } main $@ |