From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id AKcaOf6HsF5yTQAA0tVLHw (envelope-from ) for ; Mon, 04 May 2020 21:24:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qIreBwmIsF58aQAAB5/wlQ (envelope-from ) for ; Mon, 04 May 2020 21:24:25 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5125894453E for ; Mon, 4 May 2020 21:24:22 +0000 (UTC) Received: from localhost ([::1]:43866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jViZY-0003T3-Lv for larch@yhetil.org; Mon, 04 May 2020 17:24:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jViUQ-0007nl-54 for guix-patches@gnu.org; Mon, 04 May 2020 17:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jViUP-00030A-RU for guix-patches@gnu.org; Mon, 04 May 2020 17:19:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jViUP-0007Xx-Mi for guix-patches@gnu.org; Mon, 04 May 2020 17:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41083] gnu: xfe: Fix hard-coded fhs directories. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 May 2020 21:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan Cc: 41083@debbugs.gnu.org Received: via spool by 41083-submit@debbugs.gnu.org id=B41083.158862713728998 (code B ref 41083); Mon, 04 May 2020 21:19:01 +0000 Received: (at 41083) by debbugs.gnu.org; 4 May 2020 21:18:57 +0000 Received: from localhost ([127.0.0.1]:34177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jViUK-0007Xc-NQ for submit@debbugs.gnu.org; Mon, 04 May 2020 17:18:56 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:45697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jViUI-0007XN-7A for 41083@debbugs.gnu.org; Mon, 04 May 2020 17:18:55 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay10.mail.gandi.net (Postfix) with ESMTPSA id E5C16240007; Mon, 4 May 2020 21:18:46 +0000 (UTC) From: Nicolas Goaziou References: <20200504131624.04c6d30e.raghavgururajan@disroot.org> Date: Mon, 04 May 2020 23:18:45 +0200 In-Reply-To: <20200504131624.04c6d30e.raghavgururajan@disroot.org> (Raghav Gururajan's message of "Mon, 4 May 2020 13:16:24 -0400") Message-ID: <878si72ybu.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: -1.01 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-1.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49505074317798]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.13), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[larch=yhetil.org]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[mail@nicolasgoaziou.fr,guix-patches-bounces@gnu.org]; FROM_HAS_DN(0.00)[]; URIBL_BLOCKED(0.00)[disroot.org:email]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[nicolasgoaziou.fr]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; RCVD_COUNT_SEVEN(0.00)[8]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: UmdZ+ejZgj42 Hello, Raghav Gururajan writes: > From 660f134e15438e7ee7aec1c076dca93c68e4edc6 Mon Sep 17 00:00:00 2001 > From: Raghav Gururajan > 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