From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@gnu.org>
Subject: Re: 13/15: gnu: libreoffice: Fix =?utf-8?B?4oCYc29mZmljZeKAmQ==?=
 in a pure environment.
Date: Sat, 22 Feb 2020 15:14:08 +0100
Message-ID: <87r1ymyaj3.fsf@gnu.org>
References: <20200221173940.26669.60790@vcs0.savannah.gnu.org>
 <20200221173946.F136121233@vcs0.savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:50047)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <ludo@gnu.org>) id 1j5VXo-0004Pn-7C
 for guix-devel@gnu.org; Sat, 22 Feb 2020 09:14:13 -0500
In-Reply-To: <20200221173946.F136121233@vcs0.savannah.gnu.org>
 (guix-commits@gnu.org's message of "Fri, 21 Feb 2020 12:39:46 -0500
 (EST)")
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org
Sender: "Guix-devel"
 <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
To: guix-devel@gnu.org, Tobias Geerinckx-Rice <me@tobias.gr>

Hi!

guix-commits@gnu.org skribis:

> commit d5f344c987c8cc7b597e938c22e02edf1c4335f3
> Author: Tobias Geerinckx-Rice <me@tobias.gr>
> AuthorDate: Fri Feb 21 05:19:27 2020 +0100
>
>     gnu: libreoffice: Fix =E2=80=98soffice=E2=80=99 in a pure environment.
>=20=20=20=20=20
>     * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Refer to grep
>     and coreutils by absolute file name in the soffice launcher script.

[...]

> +               ;; Use store references for strictly necessary commands,
> +               ;; but not for optional tools like =E2=80=98gdb=E2=80=99 =
and =E2=80=98valgrind=E2=80=99.
> +               (for-each (lambda (command)
> +                           (substitute* "desktop/scripts/soffice.sh"
> +                             (((format #f"~a " command))
> +                              (format #f "~a " (which command)))))
> +                         (list "dirname" "grep" "uname"))

I strongly encourage using literal strings as patterns, it=E2=80=99s more
robust.  In this case, you could replace the =E2=80=98for-each=E2=80=99 exp=
ression with
something like (untested):

  (substitute* "desktop/scripts/soffice.sh"
    (("\\<(dirname|grep|uname)\\>" _ cmomand)
     (which command)))

WDYT?

Ludo=E2=80=99.