Francois Gouget : testbot/TestAgent: Update and fix the usage message.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: ec9faa846c8a6525f67b546a60c4bcdce54ad5d3
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=ec9faa846c8a6525f67b546a...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Apr  1 17:10:06 2022 +0200

testbot/TestAgent: Update and fix the usage message.

The upgrade and restart commands were each only half documented.
The getversion command was misspelled.
Better identify optional arguments.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/scripts/TestAgent | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent
index 8691f47..a3d6e26 100755
--- a/testbot/scripts/TestAgent
+++ b/testbot/scripts/TestAgent
@@ -315,15 +315,17 @@ if (defined $Usage)
         error("try '$name0 --help' for more information\n");
         exit $Usage;
     }
-    print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n";
-    print "or     $name0 [options] <hostname> getfile <serverpath> <localpath>\n";
-    print "or     $name0 [options] <hostname> run <command> <arguments>\n";
+    print "Usage: $name0 [options] <hostname> sendfile <localpath> [<serverpath>]\n";
+    print "or     $name0 [options] <hostname> getfile <serverpath> [<localpath>]\n";
+    print "or     $name0 [options] <hostname> run <command> [<arguments>]\n";
     print "or     $name0 [options] <hostname> wait <pid>\n";
     print "or     $name0 [options] <hostname> settime\n";
     print "or     $name0 [options] <hostname> rm <serverfiles>\n";
-    print "or     $name0 [options] <hostname> getproperty <name>\n";
+    print "or     $name0 [options] <hostname> getproperty [<name>]\n";
     print "or     $name0 [options] <hostname> setproperty <name> <value>\n";
-    print "or     $name0 [options] <hostname> [getcwd|ping|version]\n";
+    print "or     $name0 [options] <hostname> (getcwd|ping|getversion)\n";
+    print "or     $name0 [options] <hostname> upgrade <localexe>\n";
+    print "or     $name0 [options] <hostname> restart <serverexe> [<arg1>...]\n";
     print "\n";
     print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n";
     print "\n";
@@ -345,18 +347,21 @@ if (defined $Usage)
     print "    --run-dntrunc-err Do not truncate the file stderr is redirected to.\n";
     print "  wait          Waits for the specified child process on the server.\n";
     print "  settime       Set the system time of the remote host.\n";
+    print "  getcwd        Returns the server's current working directory.\n";
     print "  rm            Deletes the specified files on the server.\n";
     print "  getversion    Returns the protocol version.\n";
-    print "  getproperty <name> Retrieves and prints the specified server property, for\n";
+    print "  getproperty   Retrieves and prints the <name> server property, for\n";
     print "                instance its architecture, 'server.arch'. One can print all the\n";
     print "                properties at once by omitting the name or setting it to '*'.\n";
-    print "  setproperty <name> <value> Sets the specified property.\n";
-    print "  getcwd        Returns the server's current working directory.\n";
+    print "  setproperty   Sets the <name> property to <value>.\n";
     print "  ping          Makes sure the server is still alive.\n";
-    print "  upgrade       Replaces the server executable with the specified file and\n";
-    print "                restarts it.\n";
-    print "  restart       Replaces and restarts the server from the specified server file\n";
-    print "                and arguments or from the last command line if omitted.\n";
+    print "  upgrade       Replaces the server executable with the <localexe> local file\n";
+    print "                and restarts it.\n";
+    print "  restart       The first argument is mandatory and identifies the server file\n";
+    print "                the server executable should be replaced with. The arguments\n";
+    print "                that follow, if any, are passed to the server when it is\n";
+    print "                restarted. If omitted the current server's arguments are used\n";
+    print "                instead.\n";
     print "  <hostname>    Is the hostname of the server.\n";
     print "  --port <port> Use the specified port number instead of the default one.\n";
     print "  --connect-one-timeout <time> Specifies the timeout for one connection\n";