GNU bug report logs - #41083
gnu: xfe: Fix hard-coded fhs directories.

Previous Next

Package: guix-patches;

Reported by: Raghav Gururajan <raghavgururajan <at> disroot.org>

Date: Mon, 4 May 2020 17:17:02 UTC

Severity: normal

Done: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>

Bug is archived. No further changes may be made.

Full log


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

From: Raghav Gururajan <raghavgururajan <at> disroot.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: 41083 <at> debbugs.gnu.org
Subject: Re: [bug#41083] gnu: xfe: Fix hard-coded fhs directories.
Date: Tue, 5 May 2020 11:36:51 -0400
[Message part 1 (text/plain, inline)]
Hello Nicolas!

> This indentation is unusual. I think it would be clearer to write
> 
>   (let* ((sh (string-append (assoc-ref inputs "bash")
>                             "/bin/sh"))))
> 
> I suggest the following simplification, however:
> 
>   (let* ((bash (assoc-ref inputs "bash"))
>          (coreutils (assoc-ref inputs "coreutils"))
>          (findutils (assoc-ref inputs "findutils"))
>          (file (assoc-ref inputs "file")))
>    ...)
> 
> See below for the consequences of this modification.

Thanks! I used this.

> `substitute*' accepts a list of files as its first argument. Please
> consider using the following, assuming you applied the simplification
> above.
> 
>   (with-directory-excursion "src"
>    (substitute* '("FilePanel.cpp" "help.h" "SearchPanel.cpp" ...)
>     (("/bin/sh" file) (string-append bash file))
>     (("/usr(/bin/du)" _ file) (string-append coreutils file))
>     ...))

Thanks! I used this.

> > +                 ((out
> > +                   (assoc-ref outputs "out"))  
> 
> These should be on the same line.

My new patch somehow has correct indentation.

> Wouldn't it be simpler to replace "/(usr|opt)(/local)?" with `out' in
> all files?

Thanks! I used this. But the above would conflict with "/usr/bin". So I used
"/(usr|opt)(/local)?/share".

> >      (description"XFE (X File Explorer) is a file manager for X.  It is
> > based on  
>                 ^^^^^^
>            missing space here

Fixed!

> Could you send an updated patch?

Please find updated patch attached with this email.

Regards,
RG.
[0001-gnu-xfe-Fix-hard-coded-fhs-directories.patch (text/x-patch, attachment)]

This bug report was last modified 5 years and 102 days ago.

Previous Next


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