From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Raghav Gururajan <raghavgururajan@disroot.org>
Cc: 41083@debbugs.gnu.org
Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories.
Date: Mon, 04 May 2020 23:18:45 +0200 [thread overview]
Message-ID: <878si72ybu.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <20200504131624.04c6d30e.raghavgururajan@disroot.org> (Raghav Gururajan's message of "Mon, 4 May 2020 13:16:24 -0400")
Hello,
Raghav Gururajan <raghavgururajan@disroot.org> writes:
> From 660f134e15438e7ee7aec1c076dca93c68e4edc6 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Mon, 4 May 2020 13:07:02 -0400
> Subject: [PATCH] gnu: xfe: Fix hard-coded fhs directories.
Thank you. Some cosmetics comments follow.
> + (add-after 'unpack 'patch-bin-dirs
> + (lambda* (#:key inputs #:allow-other-keys)
> + (let*
> + ((sh
> + (string-append
> + (assoc-ref inputs "bash") "/bin/sh"))
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.
> + (du
> + (string-append
> + (assoc-ref inputs "coreutils") "/bin/du"))
> + (sort
> + (string-append
> + (assoc-ref inputs "coreutils") "/bin/sort"))
> + (cut
> + (string-append
> + (assoc-ref inputs "coreutils") "/bin/cut"))
Indentation is off here.
> + (substitute* "src/FilePanel.cpp"
`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))
...))
> + ((out
> + (assoc-ref outputs "out"))
These should be on the same line.
> + (share
> + (string-append out "/share"))
> + (xfe
> + (string-append out "/share/xfe"))
Ditto. You can also re-use share.
> + (xferc
> + (string-append out "/share/xfe/xferc"))
Ditto. You can re-use xfe.
> + (icons
> + (string-append out "/share/xfe/icons"))
> + (xfe-theme
> + (string-append out "/share/xfe/icons/xfe-theme")))
> (substitute* "src/foxhacks.cpp"
> - (("/etc:/usr/share:/usr/local/share") share))
> - ;; Correct path for xfe configuration.
> + (("/usr/share") share)
> + (("/usr/local/share") share))
> + (substitute* "src/help.h"
> + (("/usr/share/xfe") xfe)
> + (("/usr/local/share/xfe") xfe)
> + (("/opt/local/share/xfe") xfe)
> + (("/usr/share/xfe/icons/xfe-theme") xfe-theme)
> + (("/usr/local/share/xfe/icons/xfe-theme") xfe-theme))
> + (substitute* "src/xfedefs.h"
> + (("/usr/share/xfe/icons") icons)
> + (("/usr/local/share/xfe/icons") icons))
Wouldn't it be simpler to replace "/(usr|opt)(/local)?" with `out' in
all files?
> (description"XFE (X File Explorer) is a file manager for X. It is based on
^^^^^^
missing space here
Could you send an updated patch?
Regards,
--
Nicolas Goaziou
next prev parent reply other threads:[~2020-05-04 21:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 17:16 [bug#41083] gnu: xfe: Fix hard-coded fhs directories Raghav Gururajan
2020-05-04 21:04 ` Ludovic Courtès
2020-05-05 15:44 ` Raghav Gururajan
2020-05-06 15:39 ` bug#41083: " Nicolas Goaziou
2020-05-06 15:52 ` [bug#41083] " Ludovic Courtès
2020-05-04 21:18 ` Nicolas Goaziou [this message]
2020-05-05 15:36 ` Raghav Gururajan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878si72ybu.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=41083@debbugs.gnu.org \
--cc=raghavgururajan@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.