Subject: [bug#32077] [PATCH 1/2] scripts: Add missing -V option to commands that document it.

From: Kyle Meyer <[email-masked]>
Date: Sat, 7 Jul 2018 00:41:34 -0400

* guix/scripts/container.scm (guix-container):
* guix/scripts/import.scm (guix-import):
* guix/scripts/substitute.scm (guix-substitute): Add -V as the short option
for --version to match show-help's description.
---
 guix/scripts/container.scm  | 3 ++-
 guix/scripts/import.scm     | 3 ++-
 guix/scripts/substitute.scm | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/guix/scripts/container.scm b/guix/scripts/container.scm
index 10aed2be7..8041d64b6 100644
--- a/guix/scripts/container.scm
+++ b/guix/scripts/container.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <[email-masked]>
+;;; Copyright © 2018 Kyle Meyer <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,7 +55,7 @@ Build and manipulate Linux containers.\n"))
       ((or ("-h") ("--help"))
        (show-help)
        (exit 0))
-      (("--version")
+      ((or ("-V") ("--version"))
        (show-version-and-exit "guix container"))
       ((action args ...)
        (if (member action %actions)
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index 67bc7a755..f8cb85700 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2014 David Thompson <[email-masked]>
+;;; Copyright © 2018 Kyle Meyer <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -104,7 +105,7 @@ Run IMPORTER with ARGS.\n"))
     ((or ("-h") ("--help"))
      (show-help)
      (exit 0))
-    (("--version")
+    ((or ("-V") ("--version"))
      (show-version-and-exit "guix import"))
     ((importer args ...)
      (if (member importer importers)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index d0beacc8e..7634bb37f 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <[email-masked]>
 ;;; Copyright © 2014 Nikita Karetnikov <[email-masked]>
+;;; Copyright © 2018 Kyle Meyer <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1108,7 +1109,7 @@ default value."
           (process-substitution store-path destination
                                 #:cache-urls (substitute-urls)
                                 #:acl (current-acl))))
-       (("--version")
+       ((or ("-V") ("--version"))
         (show-version-and-exit "guix substitute"))
        (("--help")
         (show-help))
-- 
2.18.0