From patchwork Thu Oct 15 05:58:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1382461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=GBmuylC1; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aeraR8gS; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CBdtW1ymVz9sV1 for ; Thu, 15 Oct 2020 17:00:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3XF1b8cBH8z3S/feldKPq9cYhuYf5Wpi28iL7w1mnXw=; b=GBmuylC17xseDk7vAk0pZJoQvB rHeb/16rrLvSCePp9DLDxZd8/spR4Vmflqi9HRvmDfO0kyEEN2PUcs1+U3nR59K9TUOsJFMrKxHk7 L9iGMr1uGL7bWdqDvtPshXR+/hCr0XULu55O4IXiXCs9RSp6rlbKdVPSvi7r1Txhp5NtYu4hRO3LB 3/47I+HB38iv27xkz94wLXkTxwPBkcXdYldICCIDj/31cI3+8ZDjZ944eNL/9N8cvFUUEUhx00A/E 6uk1eGhHGSN6ZqDzd4a9JTj7pp1lHCxAr001yFkqyjlWNkgGRumXtcCNGL+lrgN2+UOJXJxDCMIKO mGazdfsw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSwHg-00005i-Rs; Thu, 15 Oct 2020 05:58:40 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSwHc-0008Vj-4H for openwrt-devel@lists.openwrt.org; Thu, 15 Oct 2020 05:58:37 +0000 Received: by mail-pf1-x435.google.com with SMTP id x13so1327432pfa.9 for ; Wed, 14 Oct 2020 22:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=CO5tPOjhEAtbg1spNbdNju0kgkOJLMmKKTW775SMHvA=; b=aeraR8gSMeUy7TKNiue8lxd6h7+H4GQ35ZeatVDhd5zrv7xMRiAYXBHhctMbrn8WUc uxDNkFmBSX57+WRZAZqpqIK3ZBR5Q+a/u4RAoHJVTWU8x36MFLlG7Bu1ui8KYBeg8DLB 0X7r6+/Yu/We2wO0FogIIkqP6jy9TIqUCFSwHag0ATpIl7zA94a6YHs0oJq4+kicVdd4 OYJ5RB9fSiFoUMDMWWS21hW4+Ke0fnmZY4xwAEtq3WhL2f3Iazqj+Dx4vk6Z2nv99k18 wYdqFWUXRCaEiYxA4yENGaebEhBIp87X/dQ1dpavyRAoQFembv0PyPlA3kQ2HQbHlSU4 hX5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=CO5tPOjhEAtbg1spNbdNju0kgkOJLMmKKTW775SMHvA=; b=Tb0abOAxmF11+7bqTiaUGpiRoRloEUDVfJbx9maUQH8qcOmpicT5ttyNDP8Bjcz+Ne z0jLb87PoXhuX1ByTiCo9ZpQRM96ZtrI4h/L9Nb8KfU143XkzqfcmSW24eRBjQYkQVq5 R0A0oLMIkxZBrjZbq8v1Q4bqjKPvYN2jPEeeNjotkVuG2g89xVIq4Z2aL2WlWVUlXiWT UxWKLa+CRfyrChK1ED089UchmLMoQ7rlXlA4JGQdWUMUOjKd9j7yBQHGAFD56KqhnTy1 Vh4s4AQfEnI9859leZcQuVEVCKvzowoYHqIaSOnGuknUNQik9mczXwzFPeMW0Qf7ApA/ u28w== X-Gm-Message-State: AOAM531zOOGDvc8HQcVcpTJKITG9RbYSjiIkga8XpkrBNm3sXsvInLhd vMFrhwIUMAxYurGes8jNutHO7A+7W/qsew== X-Google-Smtp-Source: ABdhPJylq+9h5o9YAKIiv8s/YPI5XUIt/J/haYFEzJrfHB1Hrt/UZt1OjrfutWqp9Ovf7nhjQAidtQ== X-Received: by 2002:a63:b245:: with SMTP id t5mr2046785pgo.328.1602741513567; Wed, 14 Oct 2020 22:58:33 -0700 (PDT) Received: from DESKTOP-VIRSTQA.lan ([2001:470:1f05:79e:e928:5c7b:bcee:fb01]) by smtp.gmail.com with ESMTPSA id p14sm1584404pjo.46.2020.10.14.22.58.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 22:58:33 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCHv2 4/4] base-files/functions.sh: quote variables in [] Date: Wed, 14 Oct 2020 22:58:27 -0700 Message-Id: <20201015055827.29410-4-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201015055827.29410-1-rosenp@gmail.com> References: <20201015055827.29410-1-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201015_015836_221513_36CE72C0 X-CRM114-Status: GOOD ( 12.62 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:435 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org ash does not support [[]] syntax, which makes this redundant. Found with https://github.com/koalaman/shellcheck/wiki/Sc2086 Signed-off-by: Rosen Penev --- package/base-files/files/lib/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 598e283b1e..b91508c04c 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -92,7 +92,7 @@ list() { local len config_get len "$CONFIG_SECTION" "${varname}_LENGTH" 0 - [ $len = 0 ] && append CONFIG_LIST_STATE "${CONFIG_SECTION}_${varname}" + [ "$len" = 0 ] && append CONFIG_LIST_STATE "${CONFIG_SECTION}_${varname}" len=$((len + 1)) config_set "$CONFIG_SECTION" "${varname}_ITEM$len" "$value" config_set "$CONFIG_SECTION" "${varname}_LENGTH" "$len" @@ -164,7 +164,7 @@ config_list_foreach() { config_get len "${section}" "${option}_LENGTH" [ -z "$len" ] && return 0 - while [ $c -le "$len" ]; do + while [ "$c" -le "$len" ]; do config_get val "${section}" "${option}_ITEM$c" eval "$function \"\$val\" \"\$@\"" c="$((c + 1))"