iSulad/0042-isula-usage-consistency-optimization.patch

From c47dc7d4a038dd9b2e2ec3bb27938e03502724d9 Mon Sep 17 00:00:00 2001
From: songbuhuang <544824346@qq.com>
Date: Tue, 18 Oct 2022 21:25:02 +0800
Subject: [PATCH 42/43] isula usage consistency optimization

Signed-off-by: songbuhuang <544824346@qq.com>
---
 src/cmd/isula/extend/events.c       | 2 +-
 src/cmd/isula/extend/export.c       | 2 +-
 src/cmd/isula/images/images.c       | 2 +-
 src/cmd/isula/images/logout.c       | 2 +-
 src/cmd/isula/images/pull.c         | 2 +-
 src/cmd/isula/information/inspect.c | 2 +-
 src/cmd/isula/information/ps.c      | 2 +-
 src/cmd/isula/information/version.c | 2 +-
 src/cmd/isula/stream/cp.c           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cmd/isula/extend/events.c b/src/cmd/isula/extend/events.c
index 7094ac0d..b35f246a 100644
--- a/src/cmd/isula/extend/events.c
+++ b/src/cmd/isula/extend/events.c
@@ -27,7 +27,7 @@
 #include "utils_timestamp.h"
 
 const char g_cmd_events_desc[] = "Get real time events from the server";
-const char g_cmd_events_usage[] = "events [command options]";
+const char g_cmd_events_usage[] = "events [OPTIONS]";
 
 struct client_arguments g_cmd_events_args = {
     .since = NULL,
diff --git a/src/cmd/isula/extend/export.c b/src/cmd/isula/extend/export.c
index ea9b9c11..68d17c82 100644
--- a/src/cmd/isula/extend/export.c
+++ b/src/cmd/isula/extend/export.c
@@ -28,7 +28,7 @@
 #include "connect.h"
 
 const char g_cmd_export_desc[] = "export container";
-const char g_cmd_export_usage[] = "export [command options] [ID|NAME]";
+const char g_cmd_export_usage[] = "export [OPTIONS] [ID|NAME]";
 
 struct client_arguments g_cmd_export_args = {};
 
diff --git a/src/cmd/isula/images/images.c b/src/cmd/isula/images/images.c
index 3d538aa5..e4b28f5a 100644
--- a/src/cmd/isula/images/images.c
+++ b/src/cmd/isula/images/images.c
@@ -44,7 +44,7 @@
 #define SHORT_DIGEST_LEN 12
 
 const char g_cmd_images_desc[] = "List images";
-const char g_cmd_images_usage[] = "images";
+const char g_cmd_images_usage[] = "images [OPTIONS]";
 
 struct client_arguments g_cmd_images_args = {};
 /* keep track of field widths for printing. */
diff --git a/src/cmd/isula/images/logout.c b/src/cmd/isula/images/logout.c
index a5b99073..18c9b061 100644
--- a/src/cmd/isula/images/logout.c
+++ b/src/cmd/isula/images/logout.c
@@ -64,7 +64,6 @@ int client_logout(const struct client_arguments *args)
         ret = ESERVERERROR;
         goto out;
     }
-
     COMMAND_ERROR("Logout Succeeded");
 
 out:
@@ -79,6 +78,7 @@ int cmd_logout_main(int argc, const char **argv)
     int exit_code = 1; /* exit 1 if failed to logout */
     command_t cmd;
     struct command_option options[] = {
+        LOG_OPTIONS(lconf)
         COMMON_OPTIONS(g_cmd_logout_args)
     };
 
diff --git a/src/cmd/isula/images/pull.c b/src/cmd/isula/images/pull.c
index fbe7458b..548e8d90 100644
--- a/src/cmd/isula/images/pull.c
+++ b/src/cmd/isula/images/pull.c
@@ -63,7 +63,6 @@ int client_pull(const struct client_arguments *args)
         ret = ESERVERERROR;
         goto out;
     }
-
     COMMAND_ERROR("Image \"%s\" pulled", response->image_ref);
 
 out:
@@ -78,6 +77,7 @@ int cmd_pull_main(int argc, const char **argv)
     int exit_code = 1; /* exit 1 if failed to pull */
     command_t cmd;
     struct command_option options[] = {
+        LOG_OPTIONS(lconf)
         COMMON_OPTIONS(g_cmd_pull_args)
     };
 
diff --git a/src/cmd/isula/information/inspect.c b/src/cmd/isula/information/inspect.c
index bb52b42a..b86f931f 100644
--- a/src/cmd/isula/information/inspect.c
+++ b/src/cmd/isula/information/inspect.c
@@ -27,7 +27,7 @@
 #include "connect.h"
 
 const char g_cmd_inspect_desc[] = "Return low-level information on a container or image";
-const char g_cmd_inspect_usage[] = "inspect [options] CONTAINER|IMAGE [CONTAINER|IMAGE...]";
+const char g_cmd_inspect_usage[] = "inspect [OPTIONS] CONTAINER|IMAGE [CONTAINER|IMAGE...]";
 
 struct client_arguments g_cmd_inspect_args = {
     .format = NULL,
diff --git a/src/cmd/isula/information/ps.c b/src/cmd/isula/information/ps.c
index 71c01acb..57d34aa3 100644
--- a/src/cmd/isula/information/ps.c
+++ b/src/cmd/isula/information/ps.c
@@ -32,7 +32,7 @@
 #include "utils_timestamp.h"
 
 const char g_cmd_list_desc[] = "List containers";
-const char g_cmd_list_usage[] = "ps [command options]";
+const char g_cmd_list_usage[] = "ps [OPTIONS]";
 
 #define COMMAND_LENGTH_MAX 22
 #define TIME_DURATION_MAX_LEN 32
diff --git a/src/cmd/isula/information/version.c b/src/cmd/isula/information/version.c
index 1e94f08a..037a8e1f 100644
--- a/src/cmd/isula/information/version.c
+++ b/src/cmd/isula/information/version.c
@@ -27,7 +27,7 @@
 #include "constants.h"
 
 const char g_cmd_version_desc[] = "Display information about isula";
-const char g_cmd_version_usage[] = "version";
+const char g_cmd_version_usage[] = "version [OPTIONS]";
 
 struct client_arguments g_cmd_version_args = {};
 
diff --git a/src/cmd/isula/stream/cp.c b/src/cmd/isula/stream/cp.c
index 450a7990..f85602ed 100644
--- a/src/cmd/isula/stream/cp.c
+++ b/src/cmd/isula/stream/cp.c
@@ -41,7 +41,7 @@
 const char g_cmd_cp_desc[] = "Copy files/folders between a container and the local filesystem";
 
 const char g_cmd_cp_usage[] = "cp [OPTIONS] CONTAINER:SRC_PATH DEST_PATH\n"
-                              "  cp [OPTIONS] SRC_PATH CONTAINER:DEST_PATH";
+                              "              cp [OPTIONS] SRC_PATH CONTAINER:DEST_PATH";
 
 struct client_arguments g_cmd_cp_args = {};
 
-- 
2.25.1