mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 13:09:49 +04:00
Code Issues Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2022-09-03 16:30:13 +03:00
parent 9ff35c9fc3 97b27261d5
commit c41555b579
43 changed files with 2526 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/toolchain/fbtenv.cmd
View File

@@ -13,7 +13,7 @@ if not [%FBT_NOENV%] == [] (
exit /b 0
)
set "FLIPPER_TOOLCHAIN_VERSION=9"
set "FLIPPER_TOOLCHAIN_VERSION=12"
set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\i686-windows"

10
scripts/toolchain/fbtenv.sh
View File

@@ -5,7 +5,7 @@
# public variables
DEFAULT_SCRIPT_PATH="$(pwd -P)";
SCRIPT_PATH="${SCRIPT_PATH:-$DEFAULT_SCRIPT_PATH}";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"8"}";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"12"}";
FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
fbtenv_show_usage()
@@ -64,13 +64,13 @@ fbtenv_check_sourced()
fbtenv_chck_many_source()
{
if ! echo "${PS1:-""}" | grep -q "[fbt]"; then
if ! echo "${PROMPT:-""}" | grep -q "[fbt]"; then
if ! echo "${PS1:-""}" | grep -qF "[fbt]"; then
if ! echo "${PROMPT:-""}" | grep -qF "[fbt]"; then
return 0;
fi
fi
echo "Warning! It script seen to be sourced more then once!";
echo "It may signalise what you are making some mistakes, please open a new shell!";
echo "Warning! FBT environment script sourced more than once!";
echo "This may signal that you are making mistakes, please open a new shell!";
return 1;
}