From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EIgbH2ODl1+UdAAA0tVLHw (envelope-from ) for ; Tue, 27 Oct 2020 02:18: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 mp0 with LMTPS id GEnjGmODl19UIwAA1q6Kng (envelope-from ) for ; Tue, 27 Oct 2020 02:18: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 E67BB9400BF for ; Tue, 27 Oct 2020 02:18:10 +0000 (UTC) Received: from localhost ([::1]:44638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXEYr-0006GN-4n for larch@yhetil.org; Mon, 26 Oct 2020 22:18:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXEYk-0006GE-BL for guix-patches@gnu.org; Mon, 26 Oct 2020 22:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXEYk-0003TH-2B for guix-patches@gnu.org; Mon, 26 Oct 2020 22:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXEYj-00082T-Qy for guix-patches@gnu.org; Mon, 26 Oct 2020 22:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44249] [PATCH] gnu: emacs: Make strip-double-wrap more robust Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 02:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44249@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160376504130851 (code B ref -1); Tue, 27 Oct 2020 02:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2020 02:17:21 +0000 Received: from localhost ([127.0.0.1]:42233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXEY5-00081X-9H for submit@debbugs.gnu.org; Mon, 26 Oct 2020 22:17:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:33406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXEY4-00081Q-0e for submit@debbugs.gnu.org; Mon, 26 Oct 2020 22:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXEY3-0006EW-Qa for guix-patches@gnu.org; Mon, 26 Oct 2020 22:17:19 -0400 Received: from mail-co1nam11olkn2057.outbound.protection.outlook.com ([40.92.18.57]:62337 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXEXy-0003Pl-WC for guix-patches@gnu.org; Mon, 26 Oct 2020 22:17:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i0nT2kIQ1Xks1PwHc0fw036dPcQTT0BxlalrqRHhmJQVnKsFts5+bHlvyEguztmUnHS8Ay59aH042Dwyk0tFUIuioxWxM3mf7MP4kMPoiHVnBCxEG75gxzCRqG6nN8dr3gREVmsiW3gfug+EaJiJ7Tk8BFz54gZnKvQ5WuM+pnWo0IeFg40wyabY+zZ2KWziwjX8YyfC88ZBd2ckhdhteCbvq+UlVm4ldmTIz2QjEKGVONGh87+iKxo14R3sv1GfTw7EE3awXxxsQ73C0UKT8mLRHp6QumyWNn0qFvsl2I4+ZBzQ4lVjcRHCmKffJ3m0qVv2wfSakjEKX8w7BDaXjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2TmHJHOns7aYtzYf12rHBAhBfg8bTVsKrPtOah6NcV0=; b=F3Hivz4BbHtF3KBbHDBJL4t9MzDvM4zw866drS2n+VscVumgsxlPRdj1Zwgje3FHwT2lm+kNOgM6onp2kS4cReGKtVWH0cmFKjrq1fwHVmFF42ADCKsDMncwynqV3p/cBHIHKq2vMDUBeGy4JyZ9olLAWKROr/Eye/UsgPcC7AwExZNXts+2OkI6nXZyse8PanjP9s0rX7uaSQ7h0iBmv0w0AtsakJi4DSiKBvZz/A9+O82sQQD0Y6uOH295nVRPTvPWqI9irG3D44VhpXRWPI9apTbV6xeIdavSO1E9XIZVgNaDVUt6M9xnWnsIwQSHgIIlkZxvzx2Oi3ap/GmuBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2TmHJHOns7aYtzYf12rHBAhBfg8bTVsKrPtOah6NcV0=; b=Kz8sYi8rCG4L+E+w6jUQLRwMm/sq/lvPTNvjGkq2zdJzAqt+fzZHhBsqnNfnOQnymKfiB/gLjESZRijKjrKMsL2C9+bYhqHiuXz/WKPVihMq8CsY5tTj3y4ik8zeLXbu5yG9YxMFfQRO7HgMcUqtexvkdx18FIJWNLYzuJ1PtFYnsZ9Aqxi/mqtvTYiUStRJu7LYVrGaD+whP2cQ3W5YRKpU8fKrA5uSsKea8u+eb8RmQOZz+Yve4pqTZMZ2MtnZLxBIITA9JiQw2EgmvIofKXJ/aL0e0wt+jFaCHz0qVAYbR8rOs0hI0MQVu/pm3GFc2FHun6vSQ+c9dNJvE6XCnA== Received: from DM6NAM11FT031.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4d::4a) by DM6NAM11HT166.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4d::314) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Tue, 27 Oct 2020 02:02:09 +0000 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com (2a01:111:e400:fc4d::51) by DM6NAM11FT031.mail.protection.outlook.com (2a01:111:e400:fc4d::203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Tue, 27 Oct 2020 02:02:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:A322D0A43EB5FA4A1DC78CBFE99318511BEADA5F5F3296F6325640D6082896DB; UpperCasedChecksum:967EBE7E4B64012DFEBC57A88531632F05B0DA4950A556BFCA9E69F3174A0E9C; SizeAsReceived:7278; Count:45 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::2405:9d83:9d59:c5cf]) by DM5PR1001MB2105.namprd10.prod.outlook.com ([fe80::2405:9d83:9d59:c5cf%5]) with mapi id 15.20.3477.028; Tue, 27 Oct 2020 02:02:08 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 26 Oct 2020 22:01:45 -0400 Message-ID: X-Mailer: git-send-email 2.29.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [RROLcqG/Q+Omm5WiW4ZjljJTUIATu3hq] X-ClientProxiedBy: YT1PR01CA0065.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2e::34) To DM5PR1001MB2105.namprd10.prod.outlook.com (2603:10b6:4:2b::24) X-Microsoft-Original-Message-ID: <20201027020144.14125-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.lan (45.58.218.141) by YT1PR01CA0065.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2e::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Tue, 27 Oct 2020 02:02:07 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 5493961c-60cf-457b-1617-08d87a1c4f17 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUXiI7VfCKpks7wORMcO1d5NZVfCihdmUvQ282WuSMcvSDV86f+z427WKtViZ2kCDxWz4oDOJhOS0iAbBYfpO6XWEwiJpyn90HAePWnvi0nWZ2afHVdDIvGbcxVm1ZsAZcLDtccFrWMp2Ct/KO2BRYyWTj1OkTDAsAsQJ0/3QGPnVl0nyl8Lt1URjy/DwZ5MsNQ5NKqLaBCndGmXNixUePl5xtRxskVkPq8BMvXU20FrnrsxtJsOEWy+Kykn4OX2oDdlJmRol9Wu6BHtPdNGpNxEJTq7589qPoCMLHskD+IY1/xaO2+yeu4EjKFL/aQ91ZGtAhOJch525eMjTYtJN+SKmtyD917lrXI9yqDtZHDAsVN4+YjusezUdAFPxo7YdpvfQNAlvIrxRcia++8g0khhWZD3wC1VWUzyR4ehby/EKT9XWXnmkwiz4h+N0p1xmz+s0BAxVY/0e8RnD2wJ+xWw+iBbzgwfi2gIxW8Qi2+q13BN8gB/K/7gXANBPOUprH87haUp/5uaXdGR1lUTRQ5x+An6NvrfEQQs2SB6FM5Zu31ttgBdY2D7XG4ujGGIHbAF/l1CGGuQWdvgPR6FpD9G6txJo4U3liq0upAJcwF0l2VxOQOv3hEmMm3rFUVoPv3P71IqZUSi73tkinwGtoyY+6kianUNOQFIN7sub6gWGBGuXCiZPOYC1KgMOpZQxo/XbEG4DPbkQ6BqVqXWMlwNNJuIIMCTo4= X-MS-TrafficTypeDiagnostic: DM6NAM11HT166: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3VyRJUWD5VAa/EtMRk0jDnUnpAtSN4MNoPLOHq+LCLDwXMJjAnMMbC/B8HnUG21Zc2RfcFzx0fZaXp7yw1k+0jJ9Zr5H9gmmHS50gZoLPzP3IFCAaC/GxfOnJSTJOJh+y8WWvRcSUb15o6oVZpcgkeu0GniGJBIo9oml8tltkvZx+4KW0Wf0/iAFE3qK8fwJOPdBt8QkWNDQseGrOFDVbw== X-MS-Exchange-AntiSpam-MessageData: V1Vb1FIBR3635rj2pZ4WDmwtL1U+7oI0Dr9ZZq2h3Ud9SCU3EpTW6I1JJH4RxSfRTx/utooAc5aMvh70Mz1Bn6+1wCPWL35vnx930Hko61YDY0IbEH7RvHUH5xOoWv+MhpFbiUk9CtXqsBxKdpEVTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5493961c-60cf-457b-1617-08d87a1c4f17 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2020 02:02:08.8914 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM11HT166 Received-SPF: pass client-ip=40.92.18.57; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 22:17:11 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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=fail (rsa verify failed) header.d=outlook.com header.s=selector1 header.b=Kz8sYi8r; dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=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: 4.59 X-TUID: 2TXfbeUedqKw 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=git.master) --- gnu/packages/emacs.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4963379d74..5c89e4c6b6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -196,17 +196,13 @@ (lambda* (#:key outputs #:allow-other-keys) ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped ;; twice. This also fixes a minor issue, where WMs would not be - ;; able to track emacs back to emacs.desktop. The version is - ;; accessed using using THIS-PACKAGE so it "just works" for - ;; inherited Emacs packages of different versions. + ;; able to track emacs back to emacs.desktop. (with-directory-excursion (assoc-ref outputs "out") - (copy-file (string-append - "bin/emacs-" - ,(let ((this-version (package-version this-package))) - (or (false-if-exception - (version-major+minor+point this-version)) - (version-major+minor this-version)))) - "bin/emacs") + (copy-file + (car + (find-files + "bin" (file-name-predicate "^emacs-([0-9]+\\.)+[0-9]+$"))) + "bin/emacs") #t))) (add-before 'reset-gzip-timestamps 'make-compressed-files-writable ;; The 'reset-gzip-timestamps phase will throw a permission error -- 2.29.1