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 WC6YNo8TF2DMDQAA0tVLHw (envelope-from ) for ; Sun, 31 Jan 2021 20:31:11 +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 6CxZMo8TF2AWaAAAB5/wlQ (envelope-from ) for ; Sun, 31 Jan 2021 20:31:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.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 60D3A9404C7 for ; Sun, 31 Jan 2021 20:31:11 +0000 (UTC) Received: from localhost ([::1]:54292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6JNG-0004iq-C1 for larch@yhetil.org; Sun, 31 Jan 2021 15:31:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6JN9-0004gm-1U for guix-patches@gnu.org; Sun, 31 Jan 2021 15:31:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6JN8-0001J5-Pl for guix-patches@gnu.org; Sun, 31 Jan 2021 15:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6JN8-0005TN-Mg for guix-patches@gnu.org; Sun, 31 Jan 2021 15:31:02 -0500 Subject: bug#44249: [PATCH] gnu: emacs: Make strip-double-wrap more robust Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 31 Jan 2021 20:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 44249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Morgan.J.Smith@outlook.com Mail-Followup-To: 44249@debbugs.gnu.org, ludo@gnu.org, Morgan.J.Smith@outlook.com Received: via spool by 44249-done@debbugs.gnu.org id=D44249.161212506121026 (code D ref 44249); Sun, 31 Jan 2021 20:31:02 +0000 Received: (at 44249-done) by debbugs.gnu.org; 31 Jan 2021 20:31:01 +0000 Received: from localhost ([127.0.0.1]:58169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6JN7-0005T4-9T for submit@debbugs.gnu.org; Sun, 31 Jan 2021 15:31:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6JN5-0005Sr-Uu for 44249-done@debbugs.gnu.org; Sun, 31 Jan 2021 15:31:00 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38628) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6JN0-0001G9-EA; Sun, 31 Jan 2021 15:30:54 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51214 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l6JMz-000724-K9; Sun, 31 Jan 2021 15:30:54 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Sun, 31 Jan 2021 21:30:51 +0100 In-Reply-To: (Morgan J. Smith's message of "Mon, 26 Oct 2020 22:01:45 -0400") Message-ID: <87tuqwluh0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 44249-done@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.86 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 60D3A9404C7 X-Spam-Score: -2.86 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2TZQ8tugc3IP Hi Morgan, Morgan.J.Smith@outlook.com skribis: > From: Morgan Smith > > * gnu/packages/emacs.scm (emacs) [strip-double-wrap]: > Use regex to find emacs executable. This works even when the version is > changed by package transformations (ex: version=3Dgit.master) Somehow I had forgotten about this patch, but I finally applied it! > (with-directory-excursion (assoc-ref outputs "out") > - (copy-file (string-append > - "bin/emacs-" > - ,(let ((this-version (package-version this-pa= ckage))) > - (or (false-if-exception > - (version-major+minor+point this-versi= on)) > - (version-major+minor this-version)))) > - "bin/emacs") > + (copy-file > + (car > + (find-files > + "bin" (file-name-predicate "^emacs-([0-9]+\\.)+[0-9]+$= "))) Here I just remove =E2=80=98file-name-predicate=E2=80=99 because it=E2=80= =99s implicit. I checked that it works with the currently-packaged version as well as =E2=80=98--with-branch=3Demacs-next=3Dmaster=E2=80=99. Thank you, and apologies for the long delay! Ludo=E2=80=99.