GNU bug report logs - #66270
[PATCH] gnu: mpd-mpc: Install bash completions in correct location.

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 66270 in the body.
You can then email your comments to 66270 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: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: mpd-mpc: Install bash completions in correct location.
Date: Fri, 29 Sep 2023 20:45:33 +0200

* gnu/packages/mpd.scm (mpd-mpc)[#:phases]: Add ‘move-completion’.
---
 gnu/packages/mpd.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index d617dc014b..f42f08414f 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -246,7 +246,14 @@ (define-public mpd-mpc
                  ;; actually invoked.
                  (lambda _
                    (substitute* "doc/meson.build"
-                     (("rsync") "ls")))))))
+                     (("rsync") "ls"))))
+               (add-after 'install 'move-completion
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (contrib (string-append out "/share/doc/mpc/contrib"))
+                          (completion "/etc/bash-completion.d/"))
+                     (rename-file (string-append contrib "/mpc-completion.bash")
+                                  (string-append completion "/mpc"))))))))
     (inputs (list libmpdclient))
     (native-inputs
      (list pkg-config python-sphinx))

base-commit: ce0cc6137df81919389f61671096a6ce701c0889
-- 
2.41.0

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: 66270 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: mpd-mpc: Install bash completions in correct location.
Date: Fri, 29 Sep 2023 20:45:33 +0200

* gnu/packages/mpd.scm (mpd-mpc)[#:phases]: Add ‘move-completion’.
---
Ignore v1, this one is actually correct ._.

 gnu/packages/mpd.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index d617dc014b..8ce9eb4228 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -246,7 +246,16 @@ (define-public mpd-mpc
                  ;; actually invoked.
                  (lambda _
                    (substitute* "doc/meson.build"
-                     (("rsync") "ls")))))))
+                     (("rsync") "ls"))))
+               (add-after 'install 'move-completion
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (contrib (string-append out "/share/doc/mpc/contrib"))
+                          (completion
+                           (string-append out "/etc/bash-completion.d/")))
+                     (mkdir-p completion)
+                     (rename-file (string-append contrib "/mpc-completion.bash")
+                                  (string-append completion "/mpc"))))))))
     (inputs (list libmpdclient))
     (native-inputs
      (list pkg-config python-sphinx))

base-commit: ce0cc6137df81919389f61671096a6ce701c0889
-- 
2.41.0

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

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 66270 <at> debbugs.gnu.org
Subject: Re: [bug#66270] [PATCH v2] gnu: mpd-mpc: Install bash completions
 in correct location.
Date: Wed, 04 Oct 2023 12:02:25 +0200

Hi Liliana,

On Fri, 29 Sep 2023 at 20:45, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote:
> * gnu/packages/mpd.scm (mpd-mpc)[#:phases]: Add ‘move-completion’.

> +               (add-after 'install 'move-completion

LGTM.  I would use ’install-completion’ instead.  Yeah, cosmetic
nitpicking about bikeshedding because I haven’t had enough coffee
today. ;-)

Cheers,
simon

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Simon Tournier <zimon.toutoune <at> gmail.com>, 66270 <at> debbugs.gnu.org
Subject: Re: [bug#66270] [PATCH v2] gnu: mpd-mpc: Install bash completions
 in correct location.
Date: Wed, 04 Oct 2023 20:51:16 +0200

Am Mittwoch, dem 04.10.2023 um 12:02 +0200 schrieb Simon Tournier:
> Hi Liliana,
> 
> On Fri, 29 Sep 2023 at 20:45, Liliana Marie Prikler
> <liliana.prikler <at> gmail.com> wrote:
> > * gnu/packages/mpd.scm (mpd-mpc)[#:phases]: Add ‘move-completion’.
> 
> > +               (add-after 'install 'move-completion
> 
> LGTM.  I would use ’install-completion’ instead.  Yeah, cosmetic
> nitpicking about bikeshedding because I haven’t had enough coffee
> today. ;-)
It's not installing it, though – merely moving it from one place in
output, to another (the one that's actually consulted by bash).  Hence,
move.

Cheers

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

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 66270 <at> debbugs.gnu.org
Subject: Re: [bug#66270] [PATCH v2] gnu: mpd-mpc: Install bash completions
 in correct location.
Date: Thu, 05 Oct 2023 17:06:51 +0200

Hi,

On Wed, 04 Oct 2023 at 20:51, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote:

> It's not installing it, though – merely moving it from one place in
> output, to another (the one that's actually consulted by bash).  Hence,
> move.

That’s the definition of “installing files”, no? :-)

--8<---------------cut here---------------start------------->8---
INSTALL(1)                       User Commands                      INSTALL(1)

NAME
       install - copy files and set attributes

DESCRIPTION
       This  install  program copies files (often just compiled) into destina‐
       tion locations you choose.
--8<---------------cut here---------------end--------------->8---

Anyway.  I had my coffee now, so no more bikeshed between “copy” vs
“move”, which is in this context the same. ;-)

Cheers,
simon

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Simon Tournier <zimon.toutoune <at> gmail.com>, 66270 <at> debbugs.gnu.org
Subject: Re: [bug#66270] [PATCH v2] gnu: mpd-mpc: Install bash completions
 in correct location.
Date: Fri, 06 Oct 2023 10:59:27 +0200

Am Donnerstag, dem 05.10.2023 um 17:06 +0200 schrieb Simon Tournier:
> Hi,
> 
> On Wed, 04 Oct 2023 at 20:51, Liliana Marie Prikler
> <liliana.prikler <at> gmail.com> wrote:
> 
> > It's not installing it, though – merely moving it from one place in
> > output, to another (the one that's actually consulted by bash). 
> > Hence, move.
> 
> That’s the definition of “installing files”, no? :-)
> 
> --8<---------------cut here---------------start------------->8---
> INSTALL(1)                  User Commands                  INSTALL(1)
> 
> NAME
>        install - copy files and set attributes
> 
> DESCRIPTION
>        This  install  program copies files (often just compiled) into
>        destination locations you choose.
> --8<---------------cut here---------------end--------------->8---
> 
> Anyway.  I had my coffee now, so no more bikeshed between “copy” vs
> “move”, which is in this context the same. ;-)
On a high level, copying means that (a copy of) the file persists in
its previous location, whereas move means it does not.  The 'move-
convention is used for files that are placed by the build system in
some output location, that we actually want to have in a different
output location.

Cheers

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Simon Tournier <zimon.toutoune <at> gmail.com>, 66270-done <at> debbugs.gnu.org
Subject: Re: [bug#66270] [PATCH v2] gnu: mpd-mpc: Install bash completions
 in correct location.
Date: Sun, 08 Oct 2023 08:54:51 +0200

Am Freitag, dem 06.10.2023 um 10:59 +0200 schrieb Liliana Marie
Prikler:
> Am Donnerstag, dem 05.10.2023 um 17:06 +0200 schrieb Simon Tournier:
> > Hi,
> > 
> > On Wed, 04 Oct 2023 at 20:51, Liliana Marie Prikler
> > <liliana.prikler <at> gmail.com> wrote:
> > 
> > > It's not installing it, though – merely moving it from one place
> > > in
> > > output, to another (the one that's actually consulted by bash). 
> > > Hence, move.
> > 
> > That’s the definition of “installing files”, no? :-)
> > 
> > --8<---------------cut here---------------start------------->8---
> > INSTALL(1)                  User Commands                 
> > INSTALL(1)
> > 
> > NAME
> >        install - copy files and set attributes
> > 
> > DESCRIPTION
> >        This  install  program copies files (often just compiled)
> > into
> >        destination locations you choose.
> > --8<---------------cut here---------------end--------------->8---
> > 
> > Anyway.  I had my coffee now, so no more bikeshed between “copy” vs
> > “move”, which is in this context the same. ;-)
> On a high level, copying means that (a copy of) the file persists in
> its previous location, whereas move means it does not.  […]
Pushed now.

Cheers

Previous Next

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