X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/7db0572153792058e073a9f84cd6a3a72dd56dec..55e0266795bc09436ea45c3ead59d2925762d5c2:/tools/__init__.py diff --git a/tools/__init__.py b/tools/__init__.py index 7c948d4..65f0efc 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -31,18 +31,22 @@ def main(): args.sudo_timer = True args.timeout = 1800 - if not os.path.isfile(args.config): - if args.action and args.action != "init": - print('ERROR: WayDroid is not initialized, run "waydroid init"') - return 0 - elif os.geteuid() == 0 and args.action == "init": - if not os.path.exists(args.work): - os.mkdir(args.work) - else: - args.log = "/tmp/tools.log" + if os.geteuid() == 0: + if not os.path.exists(args.work): + os.mkdir(args.work) + elif not os.path.exists(args.log): + args.log = "/tmp/tools.log" tools_logging.init(args) + if not actions.initializer.is_initialized(args) and \ + args.action and args.action not in ("init", "first-launch", "log"): + if args.wait_for_init: + actions.wait_for_init(args) + else: + print('ERROR: WayDroid is not initialized, run "waydroid init"') + return 0 + # Initialize or require config if args.action == "init": actionNeedRoot(args.action) @@ -80,6 +84,8 @@ def main(): actions.app_manager.remove(args) elif args.subaction == "launch": actions.app_manager.launch(args) + elif args.subaction == "intent": + actions.app_manager.intent(args) elif args.subaction == "list": actions.app_manager.list(args) else: @@ -103,6 +109,10 @@ def main(): helpers.lxc.logcat(args) elif args.action == "show-full-ui": actions.app_manager.showFullUI(args) + elif args.action == "first-launch": + actions.remote_init_client(args) + if actions.initializer.is_initialized(args): + actions.app_manager.showFullUI(args) elif args.action == "status": actions.status.print_status(args) elif args.action == "log":