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 YKxpDKONmF9MbAAA0tVLHw (envelope-from ) for ; Tue, 27 Oct 2020 21:14: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 UBgrCKONmF9bVwAAB5/wlQ (envelope-from ) for ; Tue, 27 Oct 2020 21:14: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 97E0D94053B for ; Tue, 27 Oct 2020 21:14:10 +0000 (UTC) Received: from localhost ([::1]:59898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXWIC-0006mK-UJ for larch@yhetil.org; Tue, 27 Oct 2020 17:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXWI6-0006ly-IF for guix-patches@gnu.org; Tue, 27 Oct 2020 17:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXWI6-0002vU-9F for guix-patches@gnu.org; Tue, 27 Oct 2020 17:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXWI6-00087k-58 for guix-patches@gnu.org; Tue, 27 Oct 2020 17:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44249] [PATCH] gnu: emacs: Make strip-double-wrap more robust Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 21:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Morgan.J.Smith@outlook.com Cc: 44249@debbugs.gnu.org Received: via spool by 44249-submit@debbugs.gnu.org id=B44249.160383322031193 (code B ref 44249); Tue, 27 Oct 2020 21:14:02 +0000 Received: (at 44249) by debbugs.gnu.org; 27 Oct 2020 21:13:40 +0000 Received: from localhost ([127.0.0.1]:46160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXWHk-000873-AN for submit@debbugs.gnu.org; Tue, 27 Oct 2020 17:13:40 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:33529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXWHi-00086n-5y for 44249@debbugs.gnu.org; Tue, 27 Oct 2020 17:13:38 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay12.mail.gandi.net (Postfix) with ESMTPSA id CEDEA200007; Tue, 27 Oct 2020 21:13:30 +0000 (UTC) From: Nicolas Goaziou References: Date: Tue, 27 Oct 2020 22:13:29 +0100 In-Reply-To: (Morgan J. Smith's message of "Mon, 26 Oct 2020 22:01:45 -0400") Message-ID: <87blgn4bk6.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (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 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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-Spam-Score: -1.01 X-TUID: yVUgs07asZHW Hello, Morgan.J.Smith@outlook.com writes: > * 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=git.master) Thank you. > + (copy-file > + (car Please use pattern matching, i.e. `match', instead of `car'. > + (find-files > + "bin" (file-name-predicate "^emacs-([0-9]+\\.)+[0-9]+$"))) > + "bin/emacs") Would it be even more robust to simply catch any "emacs-" prefixed file name? Regards, -- Nicolas Goaziou