From patchwork Sat Jul 11 18:45:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1327383 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=zaouArsM; 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=Bc+e4s4x; 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 4B3zQq5Y5Nz9sRN for ; Sun, 12 Jul 2020 04:46:43 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=Yt3vBTjxvS8GXWBLNyH/aLa2bO2DCUVqaf5WdLY6bNA=; b=zaouArsM763TRbDz4LdZBSWIw4 BMRqklr7mIPKQlgNA+4ya2skwaSe1oPuQLMOUZFodbzzeJIKzV7mloJuKSrNzcDinOLxyAsa/QLgG MT4tvYMsD/PqYrg2TIUfd1I/RFyzqcsoe49setcyfUotqx+Z92GeGKxCvOwlH3EXzCUOlr4dEIUFY e6CbAdgkGVnNcflZuU+FWVstEViH3dUHDOWufp0JfpiV8VcE5U6OycqA6vRI9LMwm6KS5NYgVSfff 9SAtS/k9alAm+xxJqP29q20M6AWa9b9PdHg6u6P1uMuCTJnKb2W2lFVgpMcQ4igqip0q4OituGTm6 FjgJKkkg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVD-0003DX-A5; Sat, 11 Jul 2020 18:45:35 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVB-0003Cj-6F for openwrt-devel@lists.openwrt.org; Sat, 11 Jul 2020 18:45:33 +0000 Received: by mail-pf1-x42f.google.com with SMTP id q17so4001823pfu.8 for ; Sat, 11 Jul 2020 11:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=aC5q6qtYorJ6Kd4Zx1tBhCrE/typ1hiTyl0Ja7gy87k=; b=Bc+e4s4x6TB/Sb3eSjkPPb+8/5u5PyRepP0hlf8fQ8jlMx9v/Ll6n/JANn9l94bsSe 7F28aOV96Frtjdm8N5DgHm1jiVXr9tIEB2BYnxEO1vmx07V4/5zEhrsL+jEXV46goS6B nymPejRtV6QDUNzKcxASDw/uQsZfPmmN4yPOtHTNwrHOA63Iw/ELM+y3XAHY10/UVenh yRk9b+gPqxrGL7lc+B2LAYG14EhArl7EEFVLEXaYxx3xQXuVbK4bENuS1TWMivGb2nWI UUoMozK5Q7xtSd1KBHiJT/RtYWZgnYwFFicHK/YUW2ur7fqWYLIoVpzMiWxZatXYEDwY bhAg== 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:mime-version :content-transfer-encoding; bh=aC5q6qtYorJ6Kd4Zx1tBhCrE/typ1hiTyl0Ja7gy87k=; b=ioazOYy6N2O/ATQSzOKcAMT+EdUj9rZFo+UVuNle/QVGaLxNisJ+7RmESNO4KK+7Br bVWA7aM24JZvCWnpNQQXgNodU9ELCaMDuXxxupbsTpMgNtCIp0vT9LESQImXzKzsbvLu a4QW5mCDG7VN2DVqDDfHD2tReFeNqyv78RB4u+x7p1edv39/ruFpmSN2UWDtvTEF4D6i xNu1PChAKAlNLEChs7XODPHQsQxpSpugQMBvHyHtV1rx7tJ+6pHOYWo0uVLlXYH79Ji2 uKdLL5riCOsX9v/BuVdigSOqlKcpXwoLBimIwBoK6xKgFvSUIJUl+SJ9xF/VcNxGvzp3 +BVA== X-Gm-Message-State: AOAM530BAUQFdkEeaFa2WWqQaP0DoAoJNdDUQP2Fj7DMlxfnzDtqerZ5 zcar/Dl3PM7LhdFDBmZ5s82+YJ05myA= X-Google-Smtp-Source: ABdhPJz506IyTNTSbb/ayXIlmKTsxniXEht/GNmDA63aAiclZnkeZXPlopxV0/ezHSwcSKAv20NCCA== X-Received: by 2002:a65:6150:: with SMTP id o16mr47871102pgv.237.1594493129872; Sat, 11 Jul 2020 11:45:29 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id z11sm1510933pfj.104.2020.07.11.11.45.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 11:45:29 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCHv2 1/4] scripts/clean-package.sh: exit in case cd fails Date: Sat, 11 Jul 2020 11:45:25 -0700 Message-Id: <20200711184528.47605-1-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200711_144533_244931_4B836865 X-CRM114-Status: UNSURE ( 7.83 ) X-CRM114-Notice: Please train this message. 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:42f listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Found with shellcheck. Signed-off-by: Rosen Penev --- v2: rebased scripts/clean-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/clean-package.sh b/scripts/clean-package.sh index 035725625d..cbd12d8799 100755 --- a/scripts/clean-package.sh +++ b/scripts/clean-package.sh @@ -9,14 +9,14 @@ IFS=$'\n' exit 1 } cat "$1" | ( - cd "$2" + cd "$2" || exit 1 while read entry; do [ -n "$entry" ] || break [ ! -d "$entry" ] || [ -L "$entry" ] && rm -f "$entry" done ) sort -r "$1" | ( - cd "$2" + cd "$2" || exit 1 while read entry; do [ -n "$entry" ] || break [ -d "$entry" ] && rmdir "$entry" > /dev/null 2>&1 From patchwork Sat Jul 11 18:45:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1327380 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=jXrXpMkU; 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=dHqX1AMm; 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 4B3zQn5hN0z9sRN for ; Sun, 12 Jul 2020 04:46:41 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version: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=TSeyTwUXylrogQgVH12SyJvNyy5nHxvE4cVFeVDeAQQ=; b=jXrXpMkU6Mnct38JRp0BFD9Fu9 b0PDv0MtDNmsN6cpxcQrvawqhoYfCvtra7oo4VMOv5qA67A5ywQWZhVIWEtLa4WEcn6lyNSkFiIaH 2mJcM6hfpw2p4KCQyQGFShqWkh4LUL1pz4tF6fmjywL51tGgQG0xHSVS+kCF1j3/GVg8CMdxzGA/B mxOBuhTNzsHNS+VuF1TCQWytb7FkasUWVSI27DjokzY8DEix0Df713aiuFTS6EenvPKGL7VCWDQKm 6v6PZzjK9bbuIxoENo+7yprdtyrFVbRIRrrg5FQu56amAYQEvloVLtALGoW+JjW5v0pDWT/nZdDmu HOr2IgJg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVE-0003ED-Rv; Sat, 11 Jul 2020 18:45:36 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVC-0003Cn-6J for openwrt-devel@lists.openwrt.org; Sat, 11 Jul 2020 18:45:34 +0000 Received: by mail-pl1-x62d.google.com with SMTP id x11so3576301plo.7 for ; Sat, 11 Jul 2020 11:45:33 -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:mime-version :content-transfer-encoding; bh=nzKWRecz6Fp2vYoDiJYHCBYq9zr9vu728Uzm665rOLQ=; b=dHqX1AMmqnngbg7UEyyWHPtaT/Ai/B7k99F2FoikHSYsqWAzjltxL0ec1HCpJlE2TD Jw79K//KieQcUYgmD53hiivHEelitxYXOD1Pv4NyZjoynDR/lZB45HoCVFMATVAcSdUF ho+yE0aBBrkTHb9OzeKeXoAJ1hNOyijnLXgVCMH3Fu91W379ItDcX7EYSFQXrYYZGOUL 6fVqrnBtUCXuiJdt5AwHDcDxbIV+g1XUT71wdtfbanC+ooXHra4ie82Lv2DKV+wf1opR sc/TpPwsUKhBV+zos3u3Hk2BGz/4CY1U7QMs2kXgnauqtPGC5KUOTfKzicFFQCr8GZxC Uuvg== 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:mime-version:content-transfer-encoding; bh=nzKWRecz6Fp2vYoDiJYHCBYq9zr9vu728Uzm665rOLQ=; b=dyTV79MvAuoWcOVszUVSFFvLulM89iEjFxuxPU69UGgEIJddmdFMAnaZNILwOkmEFw s00quBHsFma5ARqRy/cueHMxXO4l8YuLIYkr7EDPCzPskW+nC9ruPJZc3tV6fSDWYRrD IdCDkIEdKaAAyfYhvpXQV8AudNxAFw+hnMiSRO9E8mGhNybkzQbVI7+fE9i69boTHNo/ dkUWR9VTexS7GtV5qG1EUSrZyuwBgaxtS93r/nyoQQmKDKEUBJv6dPEB+Ej2WCRdCGiR 5AwiLkaUuUq48mVzBO11NjtxfhO9pNI8OsNdM3KDc2i1S+mszCmy0il1Fpcirw8IZ2Y6 0Ypg== X-Gm-Message-State: AOAM5324vLno6PSf4jRNHX8wCCOJhAErXoWNwrw2MrHvt+c7PeZNYMXN 9nZzk3HAJ6Vu4OkUJLuCUOGEbssAnWc= X-Google-Smtp-Source: ABdhPJwKQ0l9doFC6J2d9r9UIZmsjpfhodkQH4xU1W7B/mrgscbZxb3E3OMUgND3Ih/diyHj4tl4+Q== X-Received: by 2002:a17:90b:94f:: with SMTP id dw15mr12350920pjb.209.1594493131815; Sat, 11 Jul 2020 11:45:31 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id z11sm1510933pfj.104.2020.07.11.11.45.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 11:45:31 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCHv2 2/4] scripts/clean-package.sh: use read -r Date: Sat, 11 Jul 2020 11:45:26 -0700 Message-Id: <20200711184528.47605-2-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200711184528.47605-1-rosenp@gmail.com> References: <20200711184528.47605-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200711_144534_235805_3DFD6840 X-CRM114-Status: UNSURE ( 7.95 ) X-CRM114-Notice: Please train this message. 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:62d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org read will mangle backslashes. Found with shellcheck. Signed-off-by: Rosen Penev --- v2: rebased scripts/clean-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/clean-package.sh b/scripts/clean-package.sh index cbd12d8799..4b536c8a48 100755 --- a/scripts/clean-package.sh +++ b/scripts/clean-package.sh @@ -10,14 +10,14 @@ IFS=$'\n' } cat "$1" | ( cd "$2" || exit 1 - while read entry; do + while read -r entry; do [ -n "$entry" ] || break [ ! -d "$entry" ] || [ -L "$entry" ] && rm -f "$entry" done ) sort -r "$1" | ( cd "$2" || exit 1 - while read entry; do + while read -r entry; do [ -n "$entry" ] || break [ -d "$entry" ] && rmdir "$entry" > /dev/null 2>&1 done From patchwork Sat Jul 11 18:45: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: 1327381 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=VjyAM2jH; 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=M0VME3rV; 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 4B3zQn5GCZz9sRK for ; Sun, 12 Jul 2020 04:46:41 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version: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=NXL5qV5aTrQCRj74QmWlXg20w0bpIEe0JuJS3pu7qqg=; b=VjyAM2jHDqd31rXOPD8EFyDIsJ S+T4XuARKaP/ZoychdT/9qq67KYflOzw1v9JfDnouDY4/2gVGR6g3DpytuzKYvypKqfOwyPcmLFcV 4iJDULP0F1Kh+d1IFAgB7v8R33PJQEe3XYlXIh/hJiRC13kdiwtTj2Bv9mGHVnzS+0XZCyLriZ99g g4lI7W0F2kwhvW8/qeM2UDFDudGfL0azY6JxzdnQZMeAXugkYhbrl6HQsh2QKc9F0MYl7MPJGkfFp DCuXYIh7wsvU7uSzUYATgO/k5REDjlntC+kJ3wvCxHAFH7w/HMvLfePzhJa0wFUJhWNbkqiOuLhOg nID1wt/Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVG-0003Ea-I6; Sat, 11 Jul 2020 18:45:38 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVD-0003D3-6J for openwrt-devel@lists.openwrt.org; Sat, 11 Jul 2020 18:45:36 +0000 Received: by mail-pf1-x431.google.com with SMTP id i14so3993033pfu.13 for ; Sat, 11 Jul 2020 11:45:34 -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:mime-version :content-transfer-encoding; bh=ax21/cIb/HkTcJrPTuwhdnobE0w8EEqcdp8oTaX3NeI=; b=M0VME3rVb9QSyOanrGttrQhqiSdCVVRJooTDM01WLNnH9O1DfWALOGqskS7/wYf2kf QjlwkrAAGgs6/TblLQKJn05R1XURlXE3i3tkmHk2KTngL7BHJTjmWVH+sgtDkdD4Hoty +Xe6JM5IyJeIFd/DYWVe2YCLEfcxc8wCoH37jefB6scuAo676eaVaEca+TfKJKKpQ7hp 12vEwU2UMQ3YrYl+OTIx/HaFXJ4LD3kezhsMgivfT5J6Kd88nrPrbN0E0RbeOqJ4bg45 jeoYhw1BnOC1L7tSnodq4rF7rTeYYsBxc/uLUX/RABmFCwHbZJPWDxdYetJ1lCxEVqtR CWmQ== 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:mime-version:content-transfer-encoding; bh=ax21/cIb/HkTcJrPTuwhdnobE0w8EEqcdp8oTaX3NeI=; b=CJSfDKj8Bz8kRLfyY5IIRFQTobROB75ycfHYHq6vzMUUj+zUOUdyOuQ1blFe+veyoU 7wgQ6Fu4TCXhReg8op1vpXhHG8Hi3cb35xW02xzZmn4FJq74mfSuzwKULSKp5uzsLdch b4dHJMKDbr4zkjYK4b53NsCZ4eZMnmUvw5YsFLr+Ucya7GhI71KoWeboaff38RDD0MyN YYLs3j9ys+eVbdMKU3CuTPiZn66LQXA+RjqjO0ML1on5lPFxaPGhTnbTBpTRpQ4kq+cx YsOxrHtArJCycCmmVAaQUXoJe2fb5EaUS74YDXc2mUSZmRNUvgqVZXm46QUK9JH+shJT mGbA== X-Gm-Message-State: AOAM5306NrC/8lu48MXFgo+37bu2cf0znuMDqx/lyvhP1OS0ZhvYBWKg wSyZ2J4CtkjPsZwUPqseZwjMnm1bymI= X-Google-Smtp-Source: ABdhPJyD+YpjVFtPKZ5v6J8/2HN8ZueW8O6LQbZGg15iJdTcIkygEUzJurgmWopGNcBMetW52b90kg== X-Received: by 2002:a63:5821:: with SMTP id m33mr64464258pgb.43.1594493132793; Sat, 11 Jul 2020 11:45:32 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id z11sm1510933pfj.104.2020.07.11.11.45.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 11:45:32 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCHv2 3/4] scripts/clean-package.sh: remove useless cat Date: Sat, 11 Jul 2020 11:45:27 -0700 Message-Id: <20200711184528.47605-3-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200711184528.47605-1-rosenp@gmail.com> References: <20200711184528.47605-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200711_144535_280253_87EB03BC X-CRM114-Status: UNSURE ( 8.45 ) X-CRM114-Notice: Please train this message. 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:431 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Found with shellcheck. Signed-off-by: Rosen Penev --- v2: rebased scripts/clean-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/clean-package.sh b/scripts/clean-package.sh index 4b536c8a48..03e49df3e7 100755 --- a/scripts/clean-package.sh +++ b/scripts/clean-package.sh @@ -8,13 +8,13 @@ IFS=$'\n' echo "File/directory not found" exit 1 } -cat "$1" | ( +( cd "$2" || exit 1 while read -r entry; do [ -n "$entry" ] || break [ ! -d "$entry" ] || [ -L "$entry" ] && rm -f "$entry" done -) +) < "$1" sort -r "$1" | ( cd "$2" || exit 1 while read -r entry; do From patchwork Sat Jul 11 18:45:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1327382 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=FTQd5O7+; 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=JuzTI+SS; 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 4B3zQq0nbxz9sRK for ; Sun, 12 Jul 2020 04:46:42 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version: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=iCpQdAcwOoDvB5wozKbsEZNHQI2lH33DGK0IZMESecE=; b=FTQd5O7+OoJEnfJmSaDz51AHTA 3aMiJbWTF62u6YfjigOmKOiCJSKSG6iOQOYRzrwJhWbE8SMXZlC/zliZ/+J+6JGdoj66Y97uI8Tej M/n+ZtCxEDXZM2vH2fm0vZfGr0QgiXO4oFIqbpm27NdTXmjRzGnpsLHHV7VMBvHTA4MyTwqhQ7rqF H7ZsT2k/uz2i26M6stxHGzA0y5KFPFu7IVh21LWUWGAZvOLkKn27Q+LblvZ4F2dHoKL3RkrA/SvLT qu1DTB9lVjZKPjdVl9JhVqzDLIccxayrqWQlGLMFeWQW/hWwAlr5lzeHzkqR1zzCrtLGHV4nSTyLA 31wMhLHw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVJ-0003FA-7Z; Sat, 11 Jul 2020 18:45:41 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juKVE-0003DP-3A for openwrt-devel@lists.openwrt.org; Sat, 11 Jul 2020 18:45:36 +0000 Received: by mail-pl1-x62e.google.com with SMTP id x11so3576319plo.7 for ; Sat, 11 Jul 2020 11:45: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:mime-version :content-transfer-encoding; bh=2uiKy0ZP4815GD5R6/A7Mkq954r37K8s3lu4a3uITFg=; b=JuzTI+SSq9HAvUkPIsnP3d83lZQ+kvjjaBneu0C7PdnEKj58fzI1wkMc9nalc906IH KIGzrPjomUnvpQLhrQejdkf9s1PK6DrfrH+UDxB5GeV18AzJHpzvCxKWlvNx/gj5IAR+ yvkfVBbBZICFo9FxXEa8Q6aRsWciWCxeZcoio5jOl/u4UgXrq1J3zCr8jsje3QtOfNXL dCWOMZJG58LsOhKeF4XeGKQbExhSAh1CqM5lDK8diwv5/eBhYe7gaLoemKitNu6I19Lh SUXphNKV4eU2r90w0sqOMhVush+uA4IBr41p8RKYfEEM2F0ALQF9kjSDggnvhihOHOA3 pmoQ== 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:mime-version:content-transfer-encoding; bh=2uiKy0ZP4815GD5R6/A7Mkq954r37K8s3lu4a3uITFg=; b=SFCUP8KHGuHyYIRKsYguoGNoiMne4j+kU0HV6AxrqDEFiTcxZwyTYREVAdgRK65bef fV3mEfy0kNRA5IXUDBY+V5VF1RimqBAplzVD62BT4UFck3kXBALQPJtGQtHREXmkanve AvzJhchgBhkSzTG3+lY2GsXBc7vPV8s90TZibQVcwkHLeNanrZzJmpvZZ5GLVCRpDn7d Wuf070WwIeKg8DXSBWIbyC28xDeHFQqXf/WmKA/vLNUazmqJkshtdJtr92NrlRQYZLoA d6TxaCbXS4y3p7/1UPGmeFvXSbzd99kVKvuztKPLOa6JmiGwV7EvXRrdrAV281I9dYNZ lssw== X-Gm-Message-State: AOAM532ETsaZStoXo7Ir4YLwdsjWD8ytH8D9rEbzyhSHoOXH9mVExdKQ +4AULAl/F0MoginIq2FIZhvUnZLRcvo= X-Google-Smtp-Source: ABdhPJxdD4gC82cxncrlD/Mz0MtvMhhWUvfrJrhJ9ivNyIAP/Pkdm82LwQ+gsfyj6iw+Docq7yUzTQ== X-Received: by 2002:a17:90a:fa09:: with SMTP id cm9mr11794747pjb.146.1594493133771; Sat, 11 Jul 2020 11:45:33 -0700 (PDT) Received: from mangix-trapnet.lan (76-14-109-232.rk.wavecable.com. [76.14.109.232]) by smtp.gmail.com with ESMTPSA id z11sm1510933pfj.104.2020.07.11.11.45.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 11:45:33 -0700 (PDT) From: Rosen Penev To: openwrt-devel@lists.openwrt.org Subject: [PATCHv2 4/4] scripts/clean-package.sh: switch from -a in if to && Date: Sat, 11 Jul 2020 11:45:28 -0700 Message-Id: <20200711184528.47605-4-rosenp@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200711184528.47605-1-rosenp@gmail.com> References: <20200711184528.47605-1-rosenp@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200711_144536_159677_A7FBBA68 X-CRM114-Status: UNSURE ( 6.70 ) X-CRM114-Notice: Please train this message. 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:62e listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rosenp[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org -a is not well defined. Signed-off-by: Rosen Penev --- v2: rebased scripts/clean-package.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/clean-package.sh b/scripts/clean-package.sh index 03e49df3e7..ccbb486eea 100755 --- a/scripts/clean-package.sh +++ b/scripts/clean-package.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash IFS=$'\n' -[ -n "$1" -a -n "$2" ] || { + +if [ -z "$1" ] || [ -z "$2" ]; then echo "Usage: $0 " exit 1 -} -[ -f "$1" -a -d "$2" ] || { +fi +if [ ! -f "$1" ] || [ ! -d "$2" ]; then echo "File/directory not found" exit 1 -} +fi ( cd "$2" || exit 1 while read -r entry; do