From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Zv59V2R94z334Q for ; Fri, 9 May 2025 10:39:58 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Zv59Q5xPvz2y59 for ; Fri, 9 May 2025 10:39:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Zv59Q0GgZz130; Fri, 9 May 2025 10:39:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746787194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kLB3pHL6Y5g5LxZScCaGb1Q2xtZeS9/g8wLP0ypc0UA=; b=0yKqaM7OHXr42SIaJv4N2HOS4dF+uTh3n77yU5XXRonzGgiW9B/YExREuJjJUNp7ISLBzy MMQzT8goqgXfGaCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746787194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kLB3pHL6Y5g5LxZScCaGb1Q2xtZeS9/g8wLP0ypc0UA=; b=cjpmjVwZM78Hngs11Gpcybo9MQd6nHYlRRtND07CRlauvW+QNlo2HHNZ1g9wHlCafFofUs T07SWSiLFt/Wq92dGq44GySrzo9cwvLIa60PwGpVn2FJrdFb/46caiSgnHXSn/cH3QhSg/ IZFuy57eUOtawBFfX10Au73RT1d5lFMY9u9hj3jltMNoQFyB9WiY0FCMmQy/H2N5b0YKCk vioo3Z/oS8HL4qJynVW7JL6b8v9gENwdLXSXMZR6GahRh0ddbqKpbInz0L9etjtk7Q/Mof wVGoaL3kse0NbpIMB4TzhCzTfaWFLyzkmrUiS8l4vO0xLPctDZVUMm7gY6zURQ== Content-Type: text/plain; charset=us-ascii Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: Mime-Version: 1.0 Subject: Re: [PATCH] functions.pl: Reformat pakfire Usage: text. From: Michael Tremer In-Reply-To: <20250508191119.3248230-1-stephen@firemypi.org> Date: Fri, 9 May 2025 11:39:53 +0100 Cc: development@lists.ipfire.org Content-Transfer-Encoding: quoted-printable Message-Id: <7D1D91A2-C94C-4D6F-83A2-1AE01F8E8F27@ipfire.org> References: <20250508191119.3248230-1-stephen@firemypi.org> To: Stephen Cuka Hello Stephen, Thank you. This applied cleanly and I pushed it into next. What is coming next? :) -Michael > On 8 May 2025, at 20:11, Stephen Cuka wrote: >=20 > - Reformat pakfire Usage: text to make it clearer. >=20 > - Add '-f | --force' to Usage:. >=20 > Signed-off-by: Stephen Cuka > --- > src/pakfire/lib/functions.pl | 38 +++++++++++++++++++++--------------- > 1 file changed, 22 insertions(+), 16 deletions(-) >=20 > diff --git a/src/pakfire/lib/functions.pl = b/src/pakfire/lib/functions.pl > index 17b04ad52..2f172c398 100644 > --- a/src/pakfire/lib/functions.pl > +++ b/src/pakfire/lib/functions.pl > @@ -111,22 +111,28 @@ sub logger { > } >=20 > sub usage { > - &Pakfire::message("Usage: pakfire [options] = "); > - &Pakfire::message(" - Contact the servers = for new lists of paks."); > - &Pakfire::message(" - Install the latest = version of all paks."); > - &Pakfire::message(" = [installed|notinstalled|upgrade] - Output a list"); > - &Pakfire::message(" of all, installed, available or = upgradeable paks."); > - &Pakfire::message(" [ ...] - Output = pak metadata."); > - &Pakfire::message(" [ ...] - = Resolve and output pak"); > - &Pakfire::message(" dependencies."); > - &Pakfire::message(" - Output a summary of = available core upgrades,"); > - &Pakfire::message(" updates and a required = reboot."); > - &Pakfire::message(""); > - &Pakfire::message(" Global options:"); > - &Pakfire::message(" --non-interactive --> Enables the = non-interactive mode."); > - &Pakfire::message(" You won't = see any question here."); > - &Pakfire::message(" -y --> Short for = --non-interactive."); > - &Pakfire::message(" --no-colors --> Turns off = the wonderful colors."); > + &Pakfire::message("Usage: pakfire COMMAND [OPTIONS] [PACKAGE = ...]"); > + &Pakfire::message("Manage IPFire add-on packages and updates."); > + &Pakfire::message("PACKAGE:"); > + &Pakfire::message(" one or more add-on package names"); > + &Pakfire::message("COMMAND:"); > + &Pakfire::message(" install - install one or more packages"); > + &Pakfire::message(" remove - remove one or more packages"); > + &Pakfire::message(" update - update the pakfire database"); > + &Pakfire::message(" upgrade - upgrade all packages to the = latest version"); > + &Pakfire::message(" list [installed | notinstalled | upgrade]"); > + &Pakfire::message(" - display a list of installed, = notinstalled,"); > + &Pakfire::message(" upgradeable or all packages"); > + &Pakfire::message(" info - display metadata for one or = more packages"); > + &Pakfire::message(" resolvedeps - display dependencies for one or = more packages"); > + &Pakfire::message(" status - display pakfire database = status,"); > + &Pakfire::message(" available updates and whether a = reboot"); > + &Pakfire::message(" is required to complete any = upgrades"); > + &Pakfire::message("OPTIONS:"); > + &Pakfire::message(" --no-colors - turn off colors"); > + &Pakfire::message(" -y | --non-interactive - automatic yes to = prompts"); > + &Pakfire::message(" -f | --force - for the update = command, force"); > + &Pakfire::message(" a pakfire database = update"); > &Pakfire::message(""); > exit 1; > } > --=20 > 2.43.0 >=20 >=20