GNU bug report logs - #32077
[PATCH 0/2] scripts: Fill in -V = --version gaps

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32077 in the body.
You can then email your comments to 32077 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: guix-patches <at> gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 0/2] scripts: Fill in -V = --version gaps
Date: Sat,  7 Jul 2018 00:38:21 -0400

Most commands use -V as the short option for --version, but a few commands
don't recognize -V despite documenting it.  Fix those commands, and for
consistency register 'guix -V' as shorthand for 'guix --version'

Kyle Meyer (2):
  scripts: Add missing -V option to commands that document it.
  ui: Add -V as short option for --version.

 guix/scripts/container.scm  | 3 ++-
 guix/scripts/import.scm     | 3 ++-
 guix/scripts/substitute.scm | 3 ++-
 guix/ui.scm                 | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

-- 
2.18.0

Message #8 received at 32077 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 32077 <at> debbugs.gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 1/2] scripts: Add missing -V option to commands that document
 it.
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 <davet <at> gnu.org>
+;;; Copyright © 2018 Kyle Meyer <kyle <at> kyleam.com>
 ;;;
 ;;; 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 <ludo <at> gnu.org>
 ;;; Copyright © 2014 David Thompson <davet <at> gnu.org>
+;;; Copyright © 2018 Kyle Meyer <kyle <at> kyleam.com>
 ;;;
 ;;; 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 <ludo <at> gnu.org>
 ;;; Copyright © 2014 Nikita Karetnikov <nikita <at> karetnikov.org>
+;;; Copyright © 2018 Kyle Meyer <kyle <at> kyleam.com>
 ;;;
 ;;; 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

Message #11 received at 32077 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 32077 <at> debbugs.gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 2/2] ui: Add -V as short option for --version.
Date: Sat,  7 Jul 2018 00:41:35 -0400

* guix/ui.scm (run-guix): Add -V as the short option for --version for
consistency with most commands.
---
 guix/ui.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 66c9233b4..6a5feaa95 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl <at> gnu.org>
 ;;; Copyright © 2016 Roel Janssen <roel <at> gnu.org>
 ;;; Copyright © 2016 Benz Schenk <benz.schenk <at> uzh.ch>
+;;; Copyright © 2018 Kyle Meyer <kyle <at> kyleam.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1598,7 +1599,7 @@ and signal handling has already been set up."
      (show-guix-usage))
     ((or ("-h") ("--help"))
      (show-guix-help))
-    (("--version")
+    ((or ("-V") ("--version"))
      (show-version-and-exit "guix"))
     (((? option? o) args ...)
      (format (current-error-port)
-- 
2.18.0

Message #16 received at 32077-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Kyle Meyer <kyle <at> kyleam.com>
Cc: 32077-done <at> debbugs.gnu.org
Subject: Re: [bug#32077] [PATCH 0/2] scripts: Fill in -V = --version gaps
Date: Sat, 07 Jul 2018 17:44:58 +0200

Hello,

Kyle Meyer <kyle <at> kyleam.com> skribis:

> Most commands use -V as the short option for --version, but a few commands
> don't recognize -V despite documenting it.  Fix those commands, and for
> consistency register 'guix -V' as shorthand for 'guix --version'

Indeed, good catch.

> Kyle Meyer (2):
>   scripts: Add missing -V option to commands that document it.
>   ui: Add -V as short option for --version.

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.