tools: Upver to 1.3.0

[waydroid.git] / tools / __init__.py

diff --git a/tools/__init__.py b/tools/__init__.py
index cdb5cdd017192a4c96186e437a8cbb732029ff44..65f0efc68be70abf7ecbbecd5b272c07c565ae54 100644 (file)
--- a/tools/__init__.py
+++ b/tools/__init__.py
@@ -27,22 +27,26 @@ def main():
         args.cache = {}
         args.work = config.defaults["work"]
         args.config = args.work + "/waydroid.cfg"
         args.cache = {}
         args.work = config.defaults["work"]
         args.config = args.work + "/waydroid.cfg"

-        args.log = args.work + "/tools.log"
+        args.log = args.work + "/waydroid.log"

         args.sudo_timer = True
         args.timeout = 1800
 
         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)
 
 
         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)
         # Initialize or require config
         if args.action == "init":
             actionNeedRoot(args.action)


@@ -64,7 +68,7 @@ def main():
                 actions.container_manager.start(args)
             elif args.subaction == "stop":
                 actions.container_manager.stop(args)
                 actions.container_manager.start(args)
             elif args.subaction == "stop":
                 actions.container_manager.stop(args)

-            if args.subaction == "restart":
+            elif args.subaction == "restart":

                 actions.container_manager.restart(args)
             elif args.subaction == "freeze":
                 actions.container_manager.freeze(args)
                 actions.container_manager.restart(args)
             elif args.subaction == "freeze":
                 actions.container_manager.freeze(args)


@@ -80,6 +84,8 @@ def main():
                 actions.app_manager.remove(args)
             elif args.subaction == "launch":
                 actions.app_manager.launch(args)
                 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:
             elif args.subaction == "list":
                 actions.app_manager.list(args)
             else:


@@ -103,13 +109,20 @@ def main():
             helpers.lxc.logcat(args)
         elif args.action == "show-full-ui":
             actions.app_manager.showFullUI(args)
             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":
             if args.clear_log:
                 helpers.run.user(args, ["truncate", "-s", "0", args.log])
         elif args.action == "status":
             actions.status.print_status(args)
         elif args.action == "log":
             if args.clear_log:
                 helpers.run.user(args, ["truncate", "-s", "0", args.log])

-            helpers.run.user(
-                args, ["tail", "-n", args.lines, "-F", args.log], output="tui")
+            try:
+                helpers.run.user(
+                    args, ["tail", "-n", args.lines, "-F", args.log], output="tui")
+            except KeyboardInterrupt:
+                pass

         else:
             logging.info("Run waydroid -h for usage information.")
 
         else:
             logging.info("Run waydroid -h for usage information.")