import: now that the worker binary is called "systemd-pull" we can shorten the verbs

Atfer all "systemd-pull pull-tar" is unnecessarily redundant, over
"systemd-pull tar"...

diff --git a/src/import/importd.c b/src/import/importd.c
index 40900ce36d755b4deb83332a20e8ed4320f7c9fd..92ad80130673b681a62ab16b6cd8e51edefecccb 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -343,9 +343,7 @@ static int transfer_start(Transfer *t) {
         if (t->pid == 0) {
                 const char *cmd[] = {
                         "systemd-pull",
-                        t->type == TRANSFER_TAR ? "pull-tar" :
-                        t->type == TRANSFER_RAW ? "pull-raw" :
-                                                      "pull-dkr",
+                        transfer_type_to_string(t->type),
                         "--verify",
                         NULL, /* verify argument */
                         NULL, /* maybe --force */

diff --git a/src/import/pull.c b/src/import/pull.c
index 9bd8b77477684fd1dd98d4b9efd517983424162a..ee3ff68036c5e2715150eece659bda8ec2473b99 100644 (file)
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -328,9 +328,9 @@ static int help(int argc, char *argv[], void *userdata) {
                "     --image-root=            Image root directory\n"
                "     --dkr-index-url=URL      Specify index URL to use for downloads\n\n"
                "Commands:\n"
-               "  pull-tar URL [NAME]         Download a TAR image\n"
-               "  pull-raw URL [NAME]         Download a RAW image\n"
-               "  pull-dkr REMOTE [NAME]      Download a DKR image\n",
+               "  tar URL [NAME]              Download a TAR image\n"
+               "  raw URL [NAME]              Download a RAW image\n"
+               "  dkr REMOTE [NAME]           Download a DKR image\n",
                program_invocation_short_name);
 
         return 0;
@@ -412,10 +412,10 @@ static int parse_argv(int argc, char *argv[]) {
 static int import_main(int argc, char *argv[]) {
 
         static const Verb verbs[] = {
-                { "help",     VERB_ANY, VERB_ANY, 0, help     },
-                { "pull-tar", 2,        3,        0, pull_tar },
-                { "pull-raw", 2,        3,        0, pull_raw },
-                { "pull-dkr", 2,        3,        0, pull_dkr },
+                { "help", VERB_ANY, VERB_ANY, 0, help     },
+                { "tar",  2,        3,        0, pull_tar },
+                { "raw",  2,        3,        0, pull_raw },
+                { "dkr",  2,        3,        0, pull_dkr },
                 {}
         };