From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 9E8EF3EDF5; Fri, 18 Nov 2022 11:00:50 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 542BC3EDF0; Fri, 18 Nov 2022 11:00:49 +0000 (UTC) Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by atuin.qyliss.net (Postfix) with ESMTPS id 698E63EDEF for ; Fri, 18 Nov 2022 11:00:45 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id x21so6286075ljg.10 for ; Fri, 18 Nov 2022 03:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=UpXu3uSI4yqva7ZCAsIP2iil7KbUviu5Uju5FNMngDk=; b=lvVBQzw9YdwsMzV1M2TJBO38XoYIdXcQ2D3ufKzUL10XRZIJkJbyQ+p8onvIC/uVSm vT+Z6lzDqBoMB2gR5zt4jfQW1YIgASRV11SxIPCDzTFQpnwuSCxpsDKBmGTwlhVO7n+9 BXZeH3NGBIRumHWvxE2rfUAgWr8b456o13bkjtZnmOLU03PPWJwcgzxEa0+f4nvgvIh5 QwDH1LqB7Jr7bRJieKzp8mapjW0K5oR9TO57a+gyfNiQMdA/1mo3vbA3mRGeNnzzXE+R kjPg2sbcW8gLWJiONjwrdWPTZEmxNOhLEAZ5axaVBwSskVFN0l/5fqrWMsElfQbac9e4 UXqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=UpXu3uSI4yqva7ZCAsIP2iil7KbUviu5Uju5FNMngDk=; b=hGR1EWAff4T12Zu0/fF6dH+aH4N9+NbPdjc/W7cB+iSlVCiEcGedY3nFq7W1prfArZ SC6w73rZYg/7kqH8YoshoaxM5COTnNbg8IuXTgx2drhDwY4jkXi1dFL7wdzPltijVb+t rY3e2YCACIRGH06ScAAH9MvmPNPAi7TnFmBaM9jLwlalNjBv86X0wU7tMvHpJNTeOmCU 28pjmB7CPqHtT6EWqjQXuEGGxOgyxEqy1ej/+/p7Ww6TIwTUVqpGm/i4PzG/x54HgC2E SO2hfSRdoZM++9byNJsW9ByldIXZC1kXQS5Ny2Sl+UPww2jF847YAk78aJUD4RnnXD+L nDjg== X-Gm-Message-State: ANoB5png6ju6sjSoFi+FnFW0bfwVeq+mStJbTEiQxpTZ0n1mycclZABg 7YEfBINIA2pjiEHDb5h//2PsRQ== X-Google-Smtp-Source: AA0mqf5RJbKuT+vtss8A534hI+ABJUsaYJnL2fET3Hkh8ikp5Qko89NaYDRXTHHFYaNI8hvUCdioKA== X-Received: by 2002:a2e:a90a:0:b0:26d:ccb6:1d47 with SMTP id j10-20020a2ea90a000000b0026dccb61d47mr2512246ljq.199.1668769244519; Fri, 18 Nov 2022 03:00:44 -0800 (PST) Received: from buamix (86-60-162-79.dynamic.lounea.fi. [86.60.162.79]) by smtp.gmail.com with ESMTPSA id n18-20020a195512000000b004a2c447598fsm614249lfe.159.2022.11.18.03.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 03:00:43 -0800 (PST) Date: Fri, 18 Nov 2022 13:00:41 +0200 From: Henri Rosten To: Alyssa Ross Subject: Re: [PATCH v2 2/2] nix/checks.nix: shellcheck more files Message-ID: <20221118110041.GA1571066@buamix> References: <20221118100947.33597-1-alyssa.ross@unikie.com> <20221118100947.33597-2-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221118100947.33597-2-alyssa.ross@unikie.com> Message-ID-Hash: UT5D2JOXPNVLZILGR75AT4IHICBZ7LGN X-Message-ID-Hash: UT5D2JOXPNVLZILGR75AT4IHICBZ7LGN X-MailFrom: henri.rosten@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: devel@spectrum-os.org X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Fri, Nov 18, 2022 at 10:09:47AM +0000, Alyssa Ross wrote: > I didn't realise that bash's ** feature (which matches any depth of > directories) wasn't enabled by default, because it appeared to work, > just didn't find all scripts. > > Signed-off-by: Alyssa Ross > Fixes: 169fdd6 ("release.nix: run shellcheck on build scripts") > --- > v2: exclude build directories Thanks for fixing this. Reviewed-by: Henri Rosten > > nix/checks.nix | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/nix/checks.nix b/nix/checks.nix > index 9eb261f..9ffdc0a 100644 > --- a/nix/checks.nix > +++ b/nix/checks.nix > @@ -11,12 +11,14 @@ > runCommand "spectrum-shellcheck" { > src = lib.cleanSourceWith { > filter = path: type: > - type == "directory" || builtins.match ''.*[^/]\.sh'' path != null; > + (builtins.baseNameOf path != "build" && type == "directory") > + || builtins.match ''.*[^/]\.sh'' path != null; > src = lib.cleanSource ../.; > }; > > nativeBuildInputs = [ shellcheck ]; > } '' > + shopt -s globstar > shellcheck $src/**/*.sh > touch $out > '' > -- > 2.35.1 >