|
|
@@ -7,13 +7,14 @@ DEFAULT_SCRIPT_PATH="$(pwd -P)";
|
|
|
SCRIPT_PATH="${SCRIPT_PATH:-$DEFAULT_SCRIPT_PATH}";
|
|
|
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"20"}";
|
|
|
FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
|
|
|
+FBT_VERBOSE="${FBT_VERBOSE:-""}";
|
|
|
|
|
|
fbtenv_show_usage()
|
|
|
{
|
|
|
echo "Running this script manually is wrong, please source it";
|
|
|
echo "Example:";
|
|
|
printf "\tsource scripts/toolchain/fbtenv.sh\n";
|
|
|
- echo "To restore your environment source fbtenv.sh with '--restore'."
|
|
|
+ echo "To restore your environment, source fbtenv.sh with '--restore'."
|
|
|
echo "Example:";
|
|
|
printf "\tsource scripts/toolchain/fbtenv.sh --restore\n";
|
|
|
}
|
|
|
@@ -42,9 +43,9 @@ fbtenv_restore_env()
|
|
|
PROMPT="$(echo "$PROMPT" | sed 's/\[fbt\]//g')";
|
|
|
fi
|
|
|
|
|
|
- PYTHONNOUSERSITE="$SAVED_PYTHONNOUSERSITE";
|
|
|
- PYTHONPATH="$SAVED_PYTHONPATH";
|
|
|
- PYTHONHOME="$SAVED_PYTHONHOME";
|
|
|
+ export PYTHONNOUSERSITE="$SAVED_PYTHONNOUSERSITE";
|
|
|
+ export PYTHONPATH="$SAVED_PYTHONPATH";
|
|
|
+ export PYTHONHOME="$SAVED_PYTHONHOME";
|
|
|
|
|
|
unset SAVED_PYTHONNOUSERSITE;
|
|
|
unset SAVED_PYTHONPATH;
|
|
|
@@ -122,7 +123,7 @@ fbtenv_get_kernel_type()
|
|
|
TOOLCHAIN_ARCH_DIR="$FBT_TOOLCHAIN_PATH/toolchain/x86_64-linux";
|
|
|
TOOLCHAIN_URL="https://update.flipperzero.one/builds/toolchain/gcc-arm-none-eabi-10.3-x86_64-linux-flipper-$FBT_TOOLCHAIN_VERSION.tar.gz";
|
|
|
elif echo "$SYS_TYPE" | grep -q "MINGW"; then
|
|
|
- echo "In MinGW shell use \"[u]fbt.cmd\" instead of \"[u]fbt\"";
|
|
|
+ echo "In MinGW shell, use \"[u]fbt.cmd\" instead of \"[u]fbt\"";
|
|
|
return 1;
|
|
|
else
|
|
|
echo "Your system configuration is not supported. Sorry.. Please report us your configuration.";
|
|
|
@@ -273,7 +274,9 @@ fbtenv_download_toolchain()
|
|
|
|
|
|
fbtenv_print_version()
|
|
|
{
|
|
|
- echo "FBT: using toolchain version $(cat "$TOOLCHAIN_ARCH_DIR/VERSION")";
|
|
|
+ if [ -n "$FBT_VERBOSE" ]; then
|
|
|
+ echo "FBT: using toolchain version $(cat "$TOOLCHAIN_ARCH_DIR/VERSION")";
|
|
|
+ fi
|
|
|
}
|
|
|
|
|
|
fbtenv_main()
|
|
|
@@ -297,14 +300,15 @@ fbtenv_main()
|
|
|
PATH="$TOOLCHAIN_ARCH_DIR/protobuf/bin:$PATH";
|
|
|
PATH="$TOOLCHAIN_ARCH_DIR/openocd/bin:$PATH";
|
|
|
PATH="$TOOLCHAIN_ARCH_DIR/openssl/bin:$PATH";
|
|
|
+ export PATH;
|
|
|
|
|
|
- SAVED_PYTHONNOUSERSITE="${PYTHONNOUSERSITE:-""}";
|
|
|
- SAVED_PYTHONPATH="${PYTHONPATH:-""}";
|
|
|
- SAVED_PYTHONHOME="${PYTHONHOME:-""}";
|
|
|
+ export SAVED_PYTHONNOUSERSITE="${PYTHONNOUSERSITE:-""}";
|
|
|
+ export SAVED_PYTHONPATH="${PYTHONPATH:-""}";
|
|
|
+ export SAVED_PYTHONHOME="${PYTHONHOME:-""}";
|
|
|
|
|
|
- PYTHONNOUSERSITE=1;
|
|
|
- PYTHONPATH=;
|
|
|
- PYTHONHOME=;
|
|
|
+ export PYTHONNOUSERSITE=1;
|
|
|
+ export PYTHONPATH=;
|
|
|
+ export PYTHONHOME=;
|
|
|
}
|
|
|
|
|
|
fbtenv_main "${1:-""}";
|