From d38f5aca5c927db071dd253cc007a1204945d497 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 27 May 2020 16:20:02 +0300
Subject: [PATCH] Fix metavar for package CLI

---
 platformio/commands/package.py |  4 ++--
 platformio/telemetry.py        | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/platformio/commands/package.py b/platformio/commands/package.py
index 04e78e30..ac5c58ee 100644
--- a/platformio/commands/package.py
+++ b/platformio/commands/package.py
@@ -36,7 +36,7 @@ def cli():
 
 
 @cli.command("pack", short_help="Create a tarball from a package")
-@click.argument("package", required=True, metavar="[source directory, tar.gz or zip]")
+@click.argument("package", required=True, metavar="<source directory, tar.gz or zip>")
 def package_pack(package):
     p = PackagePacker(package)
     archive_path = p.pack()
@@ -44,7 +44,7 @@ def package_pack(package):
 
 
 @cli.command("publish", short_help="Publish a package to the registry")
-@click.argument("package", required=True, metavar="[source directory, tar.gz or zip]")
+@click.argument("package", required=True, metavar="<source directory, tar.gz or zip>")
 @click.option(
     "--owner",
     help="PIO Account username (can be organization username). "
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index 83c53c7f..7435bdab 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -146,7 +146,15 @@ class MeasurementProtocol(TelemetryBase):
             return
 
         cmd_path = args[:1]
-        if args[0] in ("account", "device", "platform", "project", "settings",):
+        if args[0] in (
+            "account",
+            "device",
+            "platform",
+            "package",
+            "project",
+            "settings",
+            "system",
+        ):
             cmd_path = args[:2]
         if args[0] == "lib" and len(args) > 1:
             lib_subcmds = (