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>
btrfsvols
Leah Rowe 2023-09-03 17:46:59 +01:00
parent 1dc54608a1
commit 09aae7be45
1 changed files with 11 additions and 8 deletions

View File

@ -23,7 +23,7 @@ set -u -e
. "include/err.sh" . "include/err.sh"
serprog_release_dir=$(pwd)/bin/serprog serprog_release_dir=bin/serprog
sdk_dir=$(pwd)/util-fw/pico-sdk sdk_dir=$(pwd)/util-fw/pico-sdk
src_dir=$(pwd)/util-fw/pico-serprog src_dir=$(pwd)/util-fw/pico-serprog
@ -34,16 +34,19 @@ main()
[ -d "${src_dir}/" ] || ./update project repo rpi-pico-serprog \ [ -d "${src_dir}/" ] || ./update project repo rpi-pico-serprog \
|| err "fetch rpi-pico-serprog failed!\n" || 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 clean
make make
)
mkdir -p ${serprog_release_dir} mkdir -p "${serprog_release_dir}" || \
mv pico_serprog.uf2 ${serprog_release_dir}/rpi-pico-serprog.uf2 \ err "can't create dir: ${serprog_release_dir}"
|| err "rpi-pico serprog build failed!\n" mv "${src_dir}/pico_serprog.uf2" \
"${serprog_release_dir}/rpi-pico-serprog.uf2" || \
printf "\nDone!\n" err "rpi-pico serprog build failed!\n"
} }
main $@ main $@