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 2CBwIw0+al8gcgAA0tVLHw (envelope-from ) for ; Tue, 22 Sep 2020 18:10:21 +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 AGVEHw0+al/iDwAAB5/wlQ (envelope-from ) for ; Tue, 22 Sep 2020 18:10:21 +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 75BA89402AE for ; Tue, 22 Sep 2020 18:10:20 +0000 (UTC) Received: from localhost ([::1]:34534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKmk6-0001xx-VO for larch@yhetil.org; Tue, 22 Sep 2020 14:10:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKmjs-0001vl-FQ for guix-patches@gnu.org; Tue, 22 Sep 2020 14:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kKmjq-0007CR-Jy for guix-patches@gnu.org; Tue, 22 Sep 2020 14:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kKmjq-0001ZZ-FO for guix-patches@gnu.org; Tue, 22 Sep 2020 14:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41219] [PATCH 2/2] guix: Enforce package.json "files" directive. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Sep 2020 18:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: paul , 41219@debbugs.gnu.org Received: via spool by 41219-submit@debbugs.gnu.org id=B41219.16007981665975 (code B ref 41219); Tue, 22 Sep 2020 18:10:02 +0000 Received: (at 41219) by debbugs.gnu.org; 22 Sep 2020 18:09:26 +0000 Received: from localhost ([127.0.0.1]:33295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kKmjG-0001YJ-GO for submit@debbugs.gnu.org; Tue, 22 Sep 2020 14:09:26 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:49438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kKmjC-0001Y8-KP for 41219@debbugs.gnu.org; Tue, 22 Sep 2020 14:09:25 -0400 From: Jelle Licht In-Reply-To: <7bea951c-c8c8-cca9-4bfe-8d8f5c83e2ab@autistici.org> References: <20200512213131.28873-1-goodoldpaul@autistici.org> <20200512213131.28873-2-goodoldpaul@autistici.org> <875z88jkg9.fsf@jlicht.xyz> <7bea951c-c8c8-cca9-4bfe-8d8f5c83e2ab@autistici.org> Date: Tue, 22 Sep 2020 20:09:19 +0200 Message-ID: <87a6xhel9s.fsf@jlicht.xyz> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -6.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: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=fsfe.org (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: -0.91 X-TUID: 3RIuf4O6GpLS Hey Giacomo, paul writes: >>> + install-dir) >>> + (begin >>> + (copy-recursively "." install-dir) >>> + ;; Remove references to dependencies >>> + (delete-file-recursively >>> + (string-append install-dir "/node_modules")))) >>> + (if (and main >>> + (not (file-exists? >>> + (string-append >>> + install-dir "/" (dirname main))))) ^ {New,Forgotten} nitpick; this only checks for the `dirname': why not just `(string-append install-dir "/" main)'? Because if e.g. "lib/utils.js" is in "files", and main is "lib/main.js", it seems that main would not be installed with this snippet. Does that make sense? Thanks in advance, - Jelle