[bug#33527] Wrong executable name in guix hashs version and help messages

[bug#33527] Wrong executable name in guix hashs version and help messages

[Tim Gesthuizen]

[-- Attachment #1.1.1: Type: text/plain, Size: 299 bytes --]

Hi,
guix hash reports that its executable name is gcrypt hash
when using --version or --help.
I don't know whether this is intended and there is a gcrypt binary
that I do not know about but it seems to have sneaked in by a query replace.
If this is the case you find a patch attached.

Tim.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0001-guix-hash-Fix-version-and-help-messages.patch --]
[-- Type: text/x-patch; name="0001-guix-hash-Fix-version-and-help-messages.patch", Size: 1690 bytes --]

From e3ef89ff845e2abd8f20fbbc3ab9939131ebb954 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 27 Nov 2018 18:43:45 +0100
Subject: [PATCH] guix hash: Fix version and help messages

ca719424455465fca4b872c371daf2a46de88b33 changes the name of the executable to
be displayed by the --version and --help commands of `guix hash` to
"gcrypt hash".
This is reverted by this commit.

* guix/scripts/hash.scm (show-help): Change string literals
---
 guix/scripts/hash.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm
index 2bd2ac4a0..b8b215819 100644
--- a/guix/scripts/hash.scm
+++ b/guix/scripts/hash.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,7 +45,7 @@
   `((format . ,bytevector->nix-base32-string)))
 
 (define (show-help)
-  (display (G_ "Usage: gcrypt hash [OPTION] FILE
+  (display (G_ "Usage: guix hash [OPTION] FILE
 Return the cryptographic hash of FILE.
 
 Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex'
@@ -93,7 +94,7 @@ and 'hexadecimal' can be used as well).\n"))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-                  (show-version-and-exit "gcrypt hash")))))
+                  (show-version-and-exit "guix hash")))))
 
 
 \f
-- 
2.19.2


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#33527: Wrong executable name in guix hashs version and help messages

[Ludovic Courtès]

Hi Tim,

Tim Gesthuizen <tim.gesthuizen@yahoo.de> skribis:

> guix hash reports that its executable name is gcrypt hash
> when using --version or --help.
> I don't know whether this is intended and there is a gcrypt binary
> that I do not know about but it seems to have sneaked in by a query replace.

That’s probably what happened, my bad!

> From e3ef89ff845e2abd8f20fbbc3ab9939131ebb954 Mon Sep 17 00:00:00 2001
> From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
> Date: Tue, 27 Nov 2018 18:43:45 +0100
> Subject: [PATCH] guix hash: Fix version and help messages
>
> ca719424455465fca4b872c371daf2a46de88b33 changes the name of the executable to
> be displayed by the --version and --help commands of `guix hash` to
> "gcrypt hash".
> This is reverted by this commit.
>
> * guix/scripts/hash.scm (show-help): Change string literals

Applied, thanks!

Ludo’.