From 1a8e40657ad2cd2184d850c7d65b635786f73322 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 14 Jan 2015 00:40:21 -0500
Subject: [PATCH] Add an argument name to --arch and similar options

This makes the help text more accurate, and helpful.
---
 xdg-app-builtins-build-init.c | 6 +++---
 xdg-app-builtins-install.c    | 2 +-
 xdg-app-builtins-run.c        | 6 +++---
 xdg-app-builtins-update.c     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xdg-app-builtins-build-init.c b/xdg-app-builtins-build-init.c
index cbda5380..3aea5293 100644
--- a/xdg-app-builtins-build-init.c
+++ b/xdg-app-builtins-build-init.c
@@ -15,9 +15,9 @@ static char *opt_name;
 static char *opt_var;
 
 static GOptionEntry options[] = {
-  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to use", NULL },
-  { "name", 'n', 0, G_OPTION_ARG_STRING, &opt_name, "App name", NULL },
-  { "var", 'v', 0, G_OPTION_ARG_STRING, &opt_var, "Initialize var from named runtime", NULL },
+  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to use", "ARCH" },
+  { "name", 'n', 0, G_OPTION_ARG_STRING, &opt_name, "App name", "NAME" },
+  { "var", 'v', 0, G_OPTION_ARG_STRING, &opt_var, "Initialize var from named runtime", "RUNTIME" },
   { NULL }
 };
 
diff --git a/xdg-app-builtins-install.c b/xdg-app-builtins-install.c
index 10f31a62..f21457fc 100644
--- a/xdg-app-builtins-install.c
+++ b/xdg-app-builtins-install.c
@@ -13,7 +13,7 @@
 static char *opt_arch;
 
 static GOptionEntry options[] = {
-  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to install for", NULL },
+  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to install for", "ARCH" },
   { NULL }
 };
 
diff --git a/xdg-app-builtins-run.c b/xdg-app-builtins-run.c
index d6837844..ad1214a9 100644
--- a/xdg-app-builtins-run.c
+++ b/xdg-app-builtins-run.c
@@ -17,9 +17,9 @@ static char *opt_command;
 static gboolean opt_devel;
 
 static GOptionEntry options[] = {
-  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to use", NULL },
-  { "command", 0, 0, G_OPTION_ARG_STRING, &opt_command, "Command to run", NULL },
-  { "branch", 0, 0, G_OPTION_ARG_STRING, &opt_branch, "Branch to run", NULL },
+  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to use", "ARCH" },
+  { "command", 0, 0, G_OPTION_ARG_STRING, &opt_command, "Command to run", "COMMAND" },
+  { "branch", 0, 0, G_OPTION_ARG_STRING, &opt_branch, "Branch to run", "BRANCH" },
   { "devel", 'd', 0, G_OPTION_ARG_NONE, &opt_devel, "Use development runtime", NULL },
   { NULL }
 };
diff --git a/xdg-app-builtins-update.c b/xdg-app-builtins-update.c
index e543e3fb..acd04f74 100644
--- a/xdg-app-builtins-update.c
+++ b/xdg-app-builtins-update.c
@@ -13,7 +13,7 @@
 static char *opt_arch;
 
 static GOptionEntry options[] = {
-  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to update for", NULL },
+  { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, "Arch to update for", "ARCH" },
   { NULL }
 };