Merge remote-tracking branch 'origin/dev' into release-candidate

flipperdevices · May 22, 2023 · a2af281 · a2af281
2 parents 72ceb92 + a396ec8
commit a2af281
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ufbt/__init__.py b/ufbt/__init__.py
@@ -48,8 +48,8 @@ def ufbt_cli():
     if any(map(sys.argv.__contains__, bootstrap_subcommands)):
         return bootstrap_cli()
 
-    if not os.path.exists(ufbt_state_dir):
-        bootstrap_cli()
+    if not os.path.exists(ufbt_state_dir / "current"):
+        bootstrap_cli(["update"])
 
     if not (ufbt_state_dir / "current" / "scripts" / "ufbt").exists():
         print("SDK is missing scripts distribution!")
@@ -62,19 +62,17 @@ def ufbt_cli():
     if platform.system() == "Windows":
         commandline = (
             r'call "%UFBT_STATE_DIR%/current/scripts/toolchain/fbtenv.cmd" env & '
-            'python -m SCons -Q --warn=target-not-built '
+            "python -m SCons -Q --warn=target-not-built "
             r'-C "%UFBT_STATE_DIR%/current/scripts/ufbt" '
-            f'"UFBT_APP_DIR={UFBT_APP_DIR}" '
-            + " ".join(sys.argv[1:])
+            f'"UFBT_APP_DIR={UFBT_APP_DIR}" ' + " ".join(sys.argv[1:])
         )
 
     else:
         commandline = (
             '. "$UFBT_STATE_DIR/current/scripts/toolchain/fbtenv.sh" && '
-            'python3 -m SCons -Q --warn=target-not-built '
+            "python3 -m SCons -Q --warn=target-not-built "
             '-C "$UFBT_STATE_DIR/current/scripts/ufbt" '
-            f'"UFBT_APP_DIR={UFBT_APP_DIR}" '
-            + " ".join(sys.argv[1:])
+            f'"UFBT_APP_DIR={UFBT_APP_DIR}" ' + " ".join(sys.argv[1:])
         )
 
     # print(commandline)

diff --git a/ufbt/bootstrap.py b/ufbt/bootstrap.py
@@ -737,7 +737,7 @@ def _func(self, args) -> int:
 )
 
 
-def bootstrap_cli() -> Optional[int]:
+def bootstrap_cli(cmdline_args=None) -> Optional[int]:
     logging.basicConfig(
         format="%(asctime)s.%(msecs)03d [%(levelname).1s] %(message)s",
         level=logging.INFO,
@@ -775,7 +775,7 @@ def bootstrap_cli() -> Optional[int]:
     for subcommand_cls in bootstrap_subcommand_classes:
         subcommand_cls().add_to_parser(parsers)
 
-    args = root_parser.parse_args()
+    args = root_parser.parse_args(cmdline_args)
     if args.verbose:
         logging.getLogger().setLevel(logging.DEBUG)