From: Maxime Brunet <max@brnt.mx>
Date: Sat, 10 Dec 2022 19:46:46 +0000 (-0800)
Subject: fix(shell): allow command to have arguments
X-Git-Tag: 1.3.4~4
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/1be55b971dadcf952aeed25d7c84efc2b71d4c85?ds=sidebyside

fix(shell): allow command to have arguments
---

diff --git a/tools/helpers/arguments.py b/tools/helpers/arguments.py
index 85b9045..5f1893e 100644
--- a/tools/helpers/arguments.py
+++ b/tools/helpers/arguments.py
@@ -110,7 +110,7 @@ def arguments_firstLaunch(subparser):
 
 def arguments_shell(subparser):
     ret = subparser.add_parser("shell", help="run remote shell command")
-    ret.add_argument('COMMAND', nargs='?', help="command to run")
+    ret.add_argument('COMMAND', nargs='*', help="command to run")
     return ret
 
 def arguments_logcat(subparser):
diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index cb0b56c..19a7ceb 100644
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -373,7 +373,7 @@ def shell(args):
     command = ["lxc-attach", "-P", tools.config.defaults["lxc"],
                "-n", "waydroid", "--"]
     if args.COMMAND:
-        command.append(args.COMMAND)
+        command.extend(args.COMMAND)
     else:
         command.append("/system/bin/sh")
     subprocess.run(command, env={"PATH": os.environ['PATH'] + ":/system/bin:/vendor/bin"})