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 938C63EA26; Fri, 18 Nov 2022 10:11:03 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 4F4BC3E9CB; Fri, 18 Nov 2022 10:11:00 +0000 (UTC) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by atuin.qyliss.net (Postfix) with ESMTPS id A2AB23E9C1 for ; Fri, 18 Nov 2022 10:10:55 +0000 (UTC) Received: by mail-ed1-x52b.google.com with SMTP id z18so6456293edb.9 for ; Fri, 18 Nov 2022 02:10:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PHoxnMxcdN7HlmATFHjjB2d30eIXStn/N4FZrWFcc9Y=; b=Vje5rFyvsHOjuoDZegNDI0aa7eRVCUz44aYSsChrJjKtC5ykRdZeLIeaKWxBOF2brh iaxVc0GErXSFmhmQT2T/1mpcqqAjd9IGT6WhwrLML8yhcP/iQioQSuX/G8H6I8sdxJHC HjdoQ1M+v3MVOjhMkObX9F5mrCtacCuRZ+SjEQndgRSquwW2MLmgpYbg8e/o6H01gAPz tVe1AofQGv9Eitqo/40T2ea2i9XfeeamTvuQM3kUlWUkmHFUqHLjZzcWiWxz4s3PLkjS yxG35GeeeThe9L3otUMAOTcRaAhBq48ezknhFO2wvgncmXN+MDW1yvyM6QTwpAQ6jpbS rRCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PHoxnMxcdN7HlmATFHjjB2d30eIXStn/N4FZrWFcc9Y=; b=xM1jZeSyxkmj/XYHWdsDVVhH8NdOwOZCR9NdUHQ32uSDm+RdFTbwmSUzdfQl+ShJSJ 2gQNp01m4bUm24B3CZ83BQ/ouyIO9A50LcHBeHDPqscaXvFRbZ0EZzCmcBBx8Or8gVVa EPcTNia+C/Y+RqJjlNdgNUA9tEOqdir/vriNJfKmFu386CpDbkaP6n/9a1TSW7kmF8+2 L0Q4LtLPZmDHTbJSfHTvIjFtun/dK/GaxudJfH4QBpq4vWReMv1Q+pDeqX3VIbbeLgiK GPLJ+hhooX5t2qA/sSdhg3jAlk1xKbvRLCOs0YNbaTVjZXUMYRQFXS2FsAyWsuw9be9T 3YXA== X-Gm-Message-State: ANoB5pkoXEJvfJEYQ2G7T9oLvv8REw1J77wIgltMfgDI6K9eelAWO26W 1nTIv+U4ou4KSom9Se0mLiQweyKKLgPA1kLI X-Google-Smtp-Source: AA0mqf7N7Eul9Coy1Fzcvd+Em/Wup/l5YyC+awcqk/AJatFyzItGgtOLdKDVYt4inLi/3eDw4nRGDA== X-Received: by 2002:aa7:cc04:0:b0:463:1a0c:4dd1 with SMTP id q4-20020aa7cc04000000b004631a0c4dd1mr5694997edt.137.1668766253005; Fri, 18 Nov 2022 02:10:53 -0800 (PST) Received: from x220.qyliss.net (p549dce3a.dip0.t-ipconnect.de. [84.157.206.58]) by smtp.gmail.com with ESMTPSA id w14-20020a056402070e00b004691de0e25bsm423573edx.54.2022.11.18.02.10.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 02:10:52 -0800 (PST) Received: by x220.qyliss.net (Postfix, from userid 1000) id 9677A2CA; Fri, 18 Nov 2022 10:10:51 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH v2 2/2] nix/checks.nix: shellcheck more files Date: Fri, 18 Nov 2022 10:09:47 +0000 Message-Id: <20221118100947.33597-2-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221118100947.33597-1-alyssa.ross@unikie.com> References: <20221118100947.33597-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 7ROIX2GV652H2ZU2ZGLAXLDVOHJ7HMZ7 X-Message-ID-Hash: 7ROIX2GV652H2ZU2ZGLAXLDVOHJ7HMZ7 X-MailFrom: alyssa.ross@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: Henri Rosten 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: 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 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