From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 29FCD72F80 for ; Thu, 17 Jun 2021 11:14:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 121C7199C3 for ; Thu, 17 Jun 2021 11:13:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 52E79199B8 for ; Thu, 17 Jun 2021 11:13:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1A2724416B for ; Thu, 17 Jun 2021 11:13:32 +0200 (CEST) Date: Thu, 17 Jun 2021 11:13:25 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20210617085826.136788-1-f.ebner@proxmox.com> In-Reply-To: <20210617085826.136788-1-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1623921150.0nbaw8n1vk.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 1 AWL -1.726 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SOMETLD_ARE_BAD_TLD 5 .stream, .trade, .pw, .top, .press, .guru, .casa & .date TLD Abuse SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] applied: [PATCH storage 1/2] postinst: avoid spawning subshell X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2021 09:14:03 -0000 thanks for catching (serves me right for testing with break initially=20 and only a single file ;)) On June 17, 2021 10:58 am, Fabian Ebner wrote: > which makes the continue not behave as intended. >=20 > Reported by shellcheck: SC2106: This [i.e. continue] only exits the subsh= ell > caused by the (..) group >=20 > Also factor out long message for readability. >=20 > Signed-off-by: Fabian Ebner > --- > debian/postinst | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/debian/postinst b/debian/postinst > index 0630d49..963ad06 100644 > --- a/debian/postinst > +++ b/debian/postinst > @@ -10,17 +10,18 @@ case "$1" in > =20 > # TODO: remove once PVE 8.0 is released > if dpkg --compare-versions "$2" 'lt' '7.0-3'; then > + warning=3D"Warning: failed to move old CIFS credential file,= cluster not quorate?" > for file in /etc/pve/priv/*.cred; do > if [ -f "$file" ]; then > echo "Info: found CIFS credentials using old path: $= file" >&2 > - mkdir -p "/etc/pve/priv/storage" || (echo "Warning: = failed to move old CIFS credential file, cluster not quorate?" && continue) > + mkdir -p "/etc/pve/priv/storage" || { echo "$warning= " && continue; } > base=3D$(basename --suffix=3D".cred" "$file") > target=3D"/etc/pve/priv/storage/$base.pw" > if [ -f "$target" ]; then > echo "Warning: not renaming $file, because $targ= et already exists!" >&2 > else > echo "Info: renaming $file to $target" >&2 > - mv "$file" "$target" || (echo "Warning: failed t= o move old CIFS credential file, cluster not quorate?" && continue) > + mv "$file" "$target" || { echo "$warning" && con= tinue; } > fi > fi > done > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20