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 CBA5B72F3D for ; Thu, 17 Jun 2021 10:59:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BFF6D19755 for ; Thu, 17 Jun 2021 10:58:37 +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 2A3321974B for ; Thu, 17 Jun 2021 10:58:37 +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 DF07F44135 for ; Thu, 17 Jun 2021 10:58:30 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 17 Jun 2021 10:58:25 +0200 Message-Id: <20210617085826.136788-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -1.741 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] [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 08:59:07 -0000 which makes the continue not behave as intended. Reported by shellcheck: SC2106: This [i.e. continue] only exits the subshell caused by the (..) group Also factor out long message for readability. Signed-off-by: Fabian Ebner --- debian/postinst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 # TODO: remove once PVE 8.0 is released if dpkg --compare-versions "$2" 'lt' '7.0-3'; then + warning="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=$(basename --suffix=".cred" "$file") target="/etc/pve/priv/storage/$base.pw" if [ -f "$target" ]; then echo "Warning: not renaming $file, because $target already exists!" >&2 else echo "Info: renaming $file to $target" >&2 - mv "$file" "$target" || (echo "Warning: failed to move old CIFS credential file, cluster not quorate?" && continue) + mv "$file" "$target" || { echo "$warning" && continue; } fi fi done -- 2.30.2