From patchwork Mon Feb 12 10:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1897689 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=RoOncdp/; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=BfwpBPH4; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TYLzv6gyNz23nM for ; Mon, 12 Feb 2024 21:58:51 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oeRdYUZLPIk3bD2jd9lF6GQnNmaO9OkB367n9b0/ERw=; b=RoOncdp/yqceXw xhU2ww4J3DxA0KC8TuwR6+6QmJW+GGoZhxUz92a3duFkVIdgW3h1A+taIqNqjUftIRoLd05gMRDMk 9VDkgLrbfEXd/G12EleC+vGvRnpFZe82y9dITcNG/fLuAIKWR+QVuoqqzbEDpom/fZKM7Bg7CNlHu VMGVzB6dhy/rhn4Z1jRkWamW4/5I+9R/1VXrYyHn2gAdOp5jUHzPvIK5S5CyeRbM7BkNVPUHxtwuO LfJEvNUDwoNbfudVxU+HREs4cg2Chj0q2X0yPUwnyTtAwXENRt2POfmnsxID8rzGdvGQzsjgDNtSw MH/RutxZ5F3E28Jax6yA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZU0T-000000050Ov-0Cqi; Mon, 12 Feb 2024 10:57:49 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rZU0Q-000000050O0-2B3g for openwrt-devel@lists.openwrt.org; Mon, 12 Feb 2024 10:57:47 +0000 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a2f22bfb4e6so404731666b.0 for ; Mon, 12 Feb 2024 02:57:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707735465; x=1708340265; darn=lists.openwrt.org; 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=LPuHK8AURgP3qqGBJBp60FImewPA5UGYcm1BX3N3wIk=; b=BfwpBPH4n0x4n4Gicc8MzuHvxQzEx1lMLuqNO3BU31h2LtbQVegbxkmOdTMjWR7ksH 5VBQX2TNhIuM2uOJkjSr3c86x/V1jLstPq7XWDDsdJPDJmHr5ApAcbeH46Hjcp6aJa1A ttkfwuY8Y5kXE1gyPspkx4PLypbj4PJtd+C+MjO8hA5Ro1wZOzKHt2Ht3ovTh/l8kUG9 5b7mcQe8gd/DPaUu6W/ASjMLVupx3rGILIsHK9lmJkyzclJslKBdTtqhhK8Nq27XZb0V PdzzxklQw6zWSMWQDADoEf8UAVccU4jN4cR4p9004Z1fyRadh60hnpnsiooLQZG/T92k +gbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707735465; x=1708340265; 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=LPuHK8AURgP3qqGBJBp60FImewPA5UGYcm1BX3N3wIk=; b=G4WgZkPlo1UtaAQRjOn1cxbUsjMKd0K7X9itrcd3FIWv508IrUoBeuH1eSXbCuNRAw V8X7nGl9q4pl8t6B79Yo9N9p2L2U7Sfq9s5O2oL9hqlIHFfm9hAxgd/5pPY5NzL+g4Xg A4Y+doFHXfdumg0Qpd7ngBZhQX8e4f8wGRcB9oz+uswi5Ke/eGs9b2iAfbjNmiqFeJIZ Qb4r9v7hR+qogND2zlS+r8ZPazLX3xTjenNdBl70pQliBtlZccIlpi0a5XonqWEm8Dly RMkN0vQ2jM9Q/EW4jbPqqdnZavXduNiHTmYQ/FDURUs72TuUC9daPT4Ki3Q+r2Ckanhc eepg== X-Gm-Message-State: AOJu0YwxgLx3at/EQfVixh6gd8fODZQsqlcKs6R8oxji3BwUPz6TsrNc Ax4knzGP7p0sz85M5Lc+xEu+0Q2VpucXqTXudmfznZunfHOYgmuE/eKFN9/L X-Google-Smtp-Source: AGHT+IEGQtIaW5FYAmUf1kCgqDZU4RcLESspVxwrpB1e+OzD4GOK3cCMe6hyhuq5ot/kSdJUhw/Chw== X-Received: by 2002:a17:906:d118:b0:a3c:98aa:5ad1 with SMTP id b24-20020a170906d11800b00a3c98aa5ad1mr1787327ejz.56.1707735464844; Mon, 12 Feb 2024 02:57:44 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUR8q8yk6AYCR5x4fTKqA/HHythemfSyvz0juOgHhmBZbO4jybC/qiLIHYszuPhLPw6FtM2tc8PyDASctwyCH1Qjnv9YmVrjBC7oQ== Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id e2-20020a17090681c200b00a3c8f4bc31bsm91394ejx.38.2024.02.12.02.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 02:57:44 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH 3/5] base-files: sysupgrade: exit with no error for --help Date: Mon, 12 Feb 2024 11:56:59 +0100 Message-Id: <20240212105701.5812-3-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240212105701.5812-1-zajec5@gmail.com> References: <20240212105701.5812-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240212_025746_587316_67720E99 X-CRM114-Status: GOOD ( 10.40 ) X-Spam-Score: 0.0 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Callin?= =?unknown-8bit?q?g_=22sysupgrade_--help=22_should_result?= =?unknown-8bit?q?_in_printing_help_and_exiting_with_0_code=2E_Signed-off-by?= =?unknown-8bit?q?=3A_Rafa=C5=82_Mi=C5=82ecki?= =?unknown-8bit?q?_---_package/base-files/files/sbin/sysupgrade_=7C_17_++++++?= =?unknown-8bit?q?+++++++----_1_file?= =?unknown-8bit?q?_changed=2C_13_insertions=28+=29=2C_4_deletions=28-=29_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E0_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_no?= =?unknown-8bit?q?_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo2MzEgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from_author=27s?= =?unknown-8bit?q?_domain?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends_in?= =?unknown-8bit?q?_digit?= =?unknown-8bit?q?_=5Bzajec5=28at=29gmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail_provider?= =?unknown-8bit?q?_=5Bzajec5=28at=29gmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_T=5FSCC=5FBODY=5FTEXT=5FLINE___No_description_avail?= =?unknown-8bit?q?able=2E?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 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 From: Rafał Miłecki Calling "sysupgrade --help" should result in printing help and exiting with 0 code. Signed-off-by: Rafał Miłecki --- package/base-files/files/sbin/sysupgrade | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 38dda3b9a4..f5a4441dc9 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -63,9 +63,7 @@ while [ -n "$1" ]; do shift; done -IMAGE="$1" - -[ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && { +print_help() { cat <...] $0 [-q] [-i] [-c] [-u] [-o] [-k] @@ -105,9 +103,20 @@ backup-command: sysupgrade -b. Does not create a backup file. EOF - exit 1 } +IMAGE="$1" + +if [ $HELP -gt 0 ]; then + print_help + exit 0 +fi + +if [ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 ]; then + print_help + exit 1 +fi + [ -n "$IMAGE" -a -n "$NEED_IMAGE" ] && { cat <<-EOF -b|--create-backup and -r|--restore-backup do not perform a firmware upgrade.