mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbtenv: add additional environ variable to control execution flow (#2938)

Browse Source 
* fbtenv: add flags FBT_PRESERVE_TAR, FBT_SKIP_CHECK_SOURCED for usage with external tools
* fbtenv: beautify, add info to fbtenv_print_config section if FBT_VERBOSE
* fbtenv: fixes

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Lesha Lomalkin 2023-08-02 18:38:51 +03:00 committed by GitHub
parent cf6706c42e
commit c7648eb932
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/toolchain/fbtenv.sh
View File

@ -82,6 +82,9 @@ fbtenv_restore_env()
fbtenv_check_sourced() fbtenv_check_sourced()
{ {
if [ -n "${FBT_SKIP_CHECK_SOURCED:-""}" ]; then
return 0;
fi
case "${ZSH_EVAL_CONTEXT:-""}" in *:file:*) case "${ZSH_EVAL_CONTEXT:-""}" in *:file:*)
setopt +o nomatch; # disabling 'no match found' warning in zsh setopt +o nomatch; # disabling 'no match found' warning in zsh
return 0;; return 0;;
@ -200,7 +203,7 @@ fbtenv_download_toolchain_tar()
return 0; return 0;
} }
fbtenv_remove_old_tooclhain() fbtenv_remove_old_toolchain()
{ {
printf "Removing old toolchain.."; printf "Removing old toolchain..";
rm -rf "${TOOLCHAIN_ARCH_DIR:?}"; rm -rf "${TOOLCHAIN_ARCH_DIR:?}";
@ -231,12 +234,14 @@ fbtenv_unpack_toolchain()
fbtenv_cleanup() fbtenv_cleanup()
{ {
printf "Cleaning up..";
if [ -n "${FBT_TOOLCHAIN_PATH:-""}" ]; then if [ -n "${FBT_TOOLCHAIN_PATH:-""}" ]; then
rm -rf "${FBT_TOOLCHAIN_PATH:?}/toolchain/"*.tar.gz; printf "Cleaning up..";
rm -rf "${FBT_TOOLCHAIN_PATH:?}/toolchain/"*.part; rm -rf "${FBT_TOOLCHAIN_PATH:?}/toolchain/"*.part;
if [ -z "${FBT_PRESERVE_TAR:-""}" ]; then
rm -rf "${FBT_TOOLCHAIN_PATH:?}/toolchain/"*.tar.gz;
fi
echo "done";
fi fi
echo "done";
trap - 2; trap - 2;
return 0; return 0;
} }
@ -289,16 +294,22 @@ fbtenv_download_toolchain()
fbtenv_curl_wget_check || return 1; fbtenv_curl_wget_check || return 1;
fbtenv_download_toolchain_tar || return 1; fbtenv_download_toolchain_tar || return 1;
fi fi
fbtenv_remove_old_tooclhain; fbtenv_remove_old_toolchain;
fbtenv_unpack_toolchain || return 1; fbtenv_unpack_toolchain || return 1;
fbtenv_cleanup; fbtenv_cleanup;
return 0; return 0;
} }
fbtenv_print_version() fbtenv_print_config()
{ {
if [ -n "$FBT_VERBOSE" ]; then if [ -n "${FBT_VERBOSE:-""}" ]; then
echo "FBT: using toolchain version $(cat "$TOOLCHAIN_ARCH_DIR/VERSION")"; echo "FBT: using toolchain version $(cat "$TOOLCHAIN_ARCH_DIR/VERSION")";
if [ -n "${FBT_SKIP_CHECK_SOURCED:-""}" ]; then
echo "FBT: fbtenv will not check if it is sourced or not";
fi
if [ -n "${FBT_PRESERVE_TAR:-""}" ]; then
echo "FBT: toolchain archives will be saved";
fi
fi fi
} }
@ -316,7 +327,7 @@ fbtenv_main()
fbtenv_check_env_vars || return 1; fbtenv_check_env_vars || return 1;
fbtenv_check_download_toolchain || return 1; fbtenv_check_download_toolchain || return 1;
fbtenv_set_shell_prompt; fbtenv_set_shell_prompt;
fbtenv_print_version; fbtenv_print_config;
PATH="$TOOLCHAIN_ARCH_DIR/python/bin:$PATH"; PATH="$TOOLCHAIN_ARCH_DIR/python/bin:$PATH";
PATH="$TOOLCHAIN_ARCH_DIR/bin:$PATH"; PATH="$TOOLCHAIN_ARCH_DIR/bin:$PATH";
PATH="$TOOLCHAIN_ARCH_DIR/protobuf/bin:$PATH"; PATH="$TOOLCHAIN_ARCH_DIR/protobuf/bin:$PATH";