PolicyKit: Branch 'master'

[GitLab Mirror]

 docs/man/pkcheck.xml   |   12 ++++++------
 src/programs/pkcheck.c |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 7ebf554ec86e416b7843f315150c38a4ef754d06
Author: Vincent Mihalkovic <vmihalko at redhat.com>
Date:   Tue Jun 20 14:57:42 2023 +0000

    pkcheck: fix a difference between the manual page and the `--help|-h` output

diff --git a/docs/man/pkcheck.xml b/docs/man/pkcheck.xml
index a569576..ae40476 100644
--- a/docs/man/pkcheck.xml
+++ b/docs/man/pkcheck.xml
@@ -25,7 +25,7 @@
     <cmdsynopsis>
       <command>pkcheck</command>
       <arg><option>--version</option></arg>
-      <arg><option>--help</option></arg>
+      <arg><option>--help|-h</option></arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -41,13 +41,13 @@
     <cmdsynopsis>
       <command>pkcheck</command>
       <arg choice="plain">
-        <option>--action-id</option>
+        <option>--action-id|-a</option>
         <replaceable>action</replaceable>
       </arg>
 
       <group choice="req">
         <arg choice="plain">
-          <option>--process</option>
+          <option>--process|-p</option>
           <group choice="req">
             <arg choice="plain">
               <replaceable>pid</replaceable>
@@ -61,14 +61,14 @@
           </group>
         </arg>
         <arg choice="plain">
-          <option>--system-bus-name</option>
+          <option>--system-bus-name|-s</option>
           <replaceable>busname</replaceable>
         </arg>
       </group>
 
       <group>
         <arg choice="plain">
-          <option>--allow-user-interaction</option>
+          <option>--allow-user-interaction|-u</option>
         </arg>
       </group>
 
@@ -80,7 +80,7 @@
 
       <group rep="repeat">
         <arg choice="plain">
-          <option>--detail</option>
+          <option>--detail|-d</option>
           <replaceable>key</replaceable>
           <replaceable>value</replaceable>
         </arg>
diff --git a/src/programs/pkcheck.c b/src/programs/pkcheck.c
index c02ff97..1faf633 100644
--- a/src/programs/pkcheck.c
+++ b/src/programs/pkcheck.c
@@ -378,7 +378,7 @@ main (int argc, char *argv[])
   g_set_prgname ("pkcheck");
   for (n = 1; n < (guint) argc; n++)
     {
-      if (g_strcmp0 (argv[n], "--help") == 0)
+      if (g_strcmp0 (argv[n], "--help") == 0 || g_strcmp0 (argv[n], "-h") == 0)
         {
           opt_show_help = TRUE;
         }
@@ -396,7 +396,7 @@ main (int argc, char *argv[])
           if (n >= (guint) argc)
             {
 	      g_printerr (_("%s: Argument expected after `%s'\n"),
-			  g_get_prgname (), "--process");
+			  g_get_prgname (), "--process, -p");
               goto out;
             }
 
@@ -429,7 +429,7 @@ main (int argc, char *argv[])
           if (n >= (guint) argc)
             {
 	      g_printerr (_("%s: Argument expected after `%s'\n"),
-			  g_get_prgname (), "--system-bus-name");
+			  g_get_prgname (), "--system-bus-name, -s");
               goto out;
             }
 
@@ -441,7 +441,7 @@ main (int argc, char *argv[])
           if (n >= (guint) argc)
             {
 	      g_printerr (_("%s: Argument expected after `%s'\n"),
-			  g_get_prgname (), "--action-id");
+			  g_get_prgname (), "--action-id, -a");
               goto out;
             }
 
@@ -455,7 +455,7 @@ main (int argc, char *argv[])
           n++;
           if (n >= (guint) argc)
             {
-	      g_printerr (_("%s: Two arguments expected after `--detail'\n"),
+	      g_printerr (_("%s: Two arguments expected after `--detail, -d'\n"),
 			  g_get_prgname ());
               goto out;
             }
@@ -464,7 +464,7 @@ main (int argc, char *argv[])
           n++;
           if (n >= (guint) argc)
             {
-	      g_printerr (_("%s: Two arguments expected after `--detail'\n"),
+	      g_printerr (_("%s: Two arguments expected after `--detail, -d'\n"),
 			  g_get_prgname ());
               goto out;
             }