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 S5+NCcGMn19IMgAA0tVLHw (envelope-from ) for ; Mon, 02 Nov 2020 04:36:17 +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 oCD0BMGMn19iBgAA1q6Kng (envelope-from ) for ; Mon, 02 Nov 2020 04:36:17 +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 8FDF39400D3 for ; Mon, 2 Nov 2020 04:36:16 +0000 (UTC) Received: from localhost ([::1]:40210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZRZm-0004Aw-12 for larch@yhetil.org; Sun, 01 Nov 2020 23:36:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZRZa-00047z-Jk for guix-patches@gnu.org; Sun, 01 Nov 2020 23:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kZRZa-00036v-7I for guix-patches@gnu.org; Sun, 01 Nov 2020 23:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kZRZa-0002a1-42 for guix-patches@gnu.org; Sun, 01 Nov 2020 23:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44249] [PATCH v2] 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: Mon, 02 Nov 2020 04:36: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: mail@nicolasgoaziou.fr Cc: 44249@debbugs.gnu.org, Morgan Smith Received: via spool by 44249-submit@debbugs.gnu.org id=B44249.16042917609908 (code B ref 44249); Mon, 02 Nov 2020 04:36:02 +0000 Received: (at 44249) by debbugs.gnu.org; 2 Nov 2020 04:36:00 +0000 Received: from localhost ([127.0.0.1]:39219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZRZX-0002Zk-NR for submit@debbugs.gnu.org; Sun, 01 Nov 2020 23:35:59 -0500 Received: from mail-mw2nam12olkn2011.outbound.protection.outlook.com ([40.92.23.11]:47809 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZRZV-0002ZU-TR for 44249@debbugs.gnu.org; Sun, 01 Nov 2020 23:35:58 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XEu6hu95nQ5x0Zbnw48Cb65dipmFNlThcOz/60Trs4OMqN2ERdsM2GDnO6jEJ7IVLAmb37xOD+eSIGGTrhZhKRpXVd9evSWrRnpbi1b3BDsLkSw0G+GJ2B6KQntIlWyFPlxUKP/eZgO67aaXG0XC4BVJJzE5sCe4/A3zzx9gYBfpYnPDAgY1iXEdEXJkQMC5p0VMbb4P9cNGz45JY/WkKgIgBlP9njP7SeEzBNqzJivIP59OSrrbZsV/GeOrXPEKASXrwgQuDXhInakR3YKgtqjD/zBvbOtwYwVGvzkB+eMm8WqMfDO7BeMokyW3VmdEd81re3chHOh5RrKKnrpB7A== 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=YEJtcFhRPoPECNQBaZ1YDyMH9s7gV1Sfb+B0URodbHg=; b=SWjcdNrC78ikNSYrZ/SyDegUqRoi1s8wE6MlP5PDvAxgTE7auxIC1Ab9uPfeNQy53yNYFsl7y+8tTg0YCIQESZEZxA3SxDZUhyxcGa5BrPYMPe86A5DQ5qTqb0sDTpOuj8VTzOnV3mHlvlZPNSA25GcyJgiU3NgLrcedy7XSRF0FtljaPrq0/2m3iu5+2sqZb1ltL81OyQEETlBRO7In5jbXAveA0t+QY8XqZ45kx6varTLo82zbOdhyDlQKN7+ZlzD+M9Fby5ee35dbHAznDQgDASlSH0jGVUh4Ec8NH9cn6OxkTf0or7BsZWWqPzX24Z4fdnTkURjUKRsA81WAFQ== 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=YEJtcFhRPoPECNQBaZ1YDyMH9s7gV1Sfb+B0URodbHg=; b=tO7JUq7HaXwyLIYg/gdrcWn/ob1KzFiR0Z7i45PBG+KDsxEnWdvxxVAY5BDr8zhRCFuQf+iRDd8d6zRiZiyrtM9Wo92387V9GfEAWbiqeqf812zlupPvfClU4Wu+RP6xOb7yc0GSjXRs9MniKaTQGLerYU8BRVgckHI57exRiQ1+M3u85fvfX7zklJckqXZIhMWRSkyaCz+7j9BJh/iE34Fkbjv7NZnpOhg6pGOYakH3jTNb3Zx9I6ZGzd/rSqKV/S+Z6kruSlldA4n9OaU+nPIIZX+rxPM0B16HbkoXfJ3yHU7AwYgYjJcY9edI9V2knADpvNcNBv8lob4p53sU2w== Received: from DM6NAM12FT052.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::4a) by DM6NAM12HT247.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3520.9; Mon, 2 Nov 2020 04:35:51 +0000 Received: from DM5PR1001MB2105.namprd10.prod.outlook.com (2a01:111:e400:fc64::48) by DM6NAM12FT052.mail.protection.outlook.com (2a01:111:e400:fc64::158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.7 via Frontend Transport; Mon, 2 Nov 2020 04:35:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:BCCD8FCF20AE4974EC5CBA7DDACBFF90E24FB8D6D8AD9B3209A574BADB147B20; UpperCasedChecksum:ACC542CCBC3031B61C93B9326765BFE30246E2161067CAD8BFCD2B1020777A6C; SizeAsReceived:7418; Count:47 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.3499.029; Mon, 2 Nov 2020 04:35:51 +0000 From: Morgan.J.Smith@outlook.com Date: Sun, 1 Nov 2020 23:35:04 -0500 Message-ID: X-Mailer: git-send-email 2.29.2 In-Reply-To: <87blgn4bk6.fsf@nicolasgoaziou.fr> References: <87blgn4bk6.fsf@nicolasgoaziou.fr> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [Wrf2K68hXFURpUXF/5m6AfU5DUD8bkNJ] X-ClientProxiedBy: YQBPR01CA0042.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::14) To DM5PR1001MB2105.namprd10.prod.outlook.com (2603:10b6:4:2b::24) X-Microsoft-Original-Message-ID: <20201102043503.21360-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.lan (70.30.20.229) by YQBPR01CA0042.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Mon, 2 Nov 2020 04:35:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 51f752b7-f0d4-4c96-17c4-08d87ee8c6d5 X-MS-Exchange-SLBlob-MailProps: qY7UPrLqMbYdK6Y+/++nIW13Zwwbu7eRoi/3rooBtIcxEMNNPohAz6lyxbF5ZqMX7UETKoA8CBLtesGt5c4p/TFJF69OnqjeS5AET9mgveZZvbWMJTh0YAnbRpbvqxuy5TsEmFCwiZro7D+6Y0rMF4CtUDnPOGKhYdEfVp+BAvfcule61XvwKumiBStuk6rq8Z2FSaAHw51+/yh0MYAYAc9eSZSg6aIjzwmoM9jq2cOpaeYJjl2es098r2zMmaIONPPvMlV2ykQKs200qWK4LL/g1R1RvlZJhI5J7ECyRXbTYxz/l/gAZ3r8gYtwFI7P1j87x7wNtLhYl6pCBSqAneOHSoae8Eza3Ac69NIJK/ofDB/KPC1TInXY2tGb3N0lQSZtpu6cLvFXvjkGKsyO/Zna2sv/Ocd1vIRWE28DvAGWZpwpm3icGXv5Xb18IuFDYKNDrdkWNX1o1JT3tA7UCeLjgby5zkDOnt9W0xC2cBNbcSzCJVkbzE8RskzIdS8pJ/ckJwaDgvbWGc2lrX9VI8nkEbZR5b7W2C8YiXXC4pShhkOIFvLqQetMFKZWaAMtwiDdbZcYdypVpxDiyut3LeKJJRcpKtm/a6ixldiqmAVD1RO9KZ2nP+UUOC34IIcs7DvOhQ1W+Y2dXMTX9A2ICtebe4Fbr9w3HpUkPXb9cceStt77aWzPhmVl/TT8D8fSfzKJhrxRJyRFIlhKSh+b2Q== X-MS-TrafficTypeDiagnostic: DM6NAM12HT247: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZXjNlWbumsMnkVGzhsg2V4K6pHhAK+0XvxebbO9Be8yhGLQJdYjdK/iQ6i42jM84Bha5ylBm9ageZyN7rfWAZ6PRfFHQ1QSTY5JJ39q/eoxbs3oR2QxnV49d7XF4sOLd/VHbJ3SihmMvRnBZb/vuiPpwaUCoRkMk+nGI1grqYts/2LpjTu5oKCCfNDHNgNhY37KR/+sCoAApzvZBTK1KJA== X-MS-Exchange-AntiSpam-MessageData: k2WaH76yCDYJNjcoAqCpToApOqAWKKNM38K+edwufhfn3uZVY5C3ROv+UPFnsa/yEW2rEnpexcDYKXTYO5xj4VydlOmSuIUsw7Ai1l9EuRXw1D+SmkET3Ef3vts1i2Ic9hK5YzMeHzxfVQvkk+oX6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51f752b7-f0d4-4c96-17c4-08d87ee8c6d5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2020 04:35:51.3247 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT052.eop-nam12.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: DM6NAM12HT247 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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: ns3122888.ip-94-23-21.eu X-Spam-Score: 6.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=outlook.com header.s=selector1 header.b=tO7JUq7H; arc=reject (signature check failed: fail, {[1] = sig:microsoft.com:reject}); 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: Yes X-TUID: AsMNGgq2eR1C 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 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 4963379d74..00441dee45 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -123,6 +123,9 @@ (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no check target + #:modules ((guix build glib-or-gtk-build-system) + (guix build utils) + (ice-9 match)) #:configure-flags (list "--with-modules" "--with-cairo" "--disable-build-details") @@ -196,17 +199,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 + (match + (find-files "bin" (file-name-predicate "^emacs-")) + (((? string? string)) string)) + "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