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 4ZthZr0cHLz33Hs for ; Thu, 8 May 2025 19:12:04 +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 4ZthZm4Qrqz2xVX for ; Thu, 8 May 2025 19:12:00 +0000 (UTC) Received: from resqmta-c2p-570216.sys.comcast.net (resqmta-c2p-570216.sys.comcast.net [IPv6:2001:558:fd00:56::6]) (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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZthZk3BrLz2SF for ; Thu, 8 May 2025 19:11:58 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=comcastmailservice.net header.s=20211018a header.b=VFwQJSX0; spf=none (mail01.ipfire.org: domain of stephen@firemypi.org has no SPF policy when checking 2001:558:fd00:56::6) smtp.mailfrom=stephen@firemypi.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1746731520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=OhYq0g72qLnse5RVTx9A6cr8DTLtkHo6M9uKreM4Qaw=; b=bPMxaQLwGOpW49GHXr8nTt5hQoaSVIHc7tRw2AwDQ+YGH7yggiCX5omBYJDlQGze91YeRm KmYKDQZLUPCWV5FtdjAQ2BIifeN4rZ2Q2/MFeaFWaDMTB4F2zfh51ZUoyD6wBE0IVldQcb 33HvoY0fHDA9W8L2WncGM5PdEbpLmicuR1JYPH7lVnETGi8DtTME5LOY1cNA8pESY+A2B+ icyTH3lxDUc+yMP19zycmZvy3m+/pjAdRAKikdX5qexWFi0UYSTwX4EGa0gA41ct3XMcjp +mvIU/SdVnckmzWIybGBG3vvOZs8s0S2hebUS/8Y3NlO9VRBFQ2OyS7GhJOGlQ== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1746731520; a=rsa-sha256; cv=none; b=LnUT0UQB51nhnBbbYAVHQsBlwT+xcR6IpknFNuih4XhVOYMsaljCWmaLPhcyK+T3IXnPwf mKalSG+NHXmXK/a+qTk1IlnVOr7nPVEPhtc3vDcLfTELKwg54Q0rS1h5L03CF65j4/PO3R GHt3SWJ3odp8kiHzLypgubVX7HQktc4QKAVqamyGV2AyC56G7ftRsOTLQTMZ3hoT7UcgJ/ 7vVPQqOeBgdtv5Wi5yXprgLjwFPqO0948wr8sIiTqlFnAcwvM1eajZrExrGQ2AkYIt2uv8 R9qKcR76hw4K0Ik/1F6qV8n6oVeYKQ9YFDEsZxXwFs7gigPgHKOD0H3BtZYQiQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=comcastmailservice.net header.s=20211018a header.b=VFwQJSX0; spf=none (mail01.ipfire.org: domain of stephen@firemypi.org has no SPF policy when checking 2001:558:fd00:56::6) smtp.mailfrom=stephen@firemypi.org; dmarc=none Received: from resomta-c2p-555441.sys.comcast.net ([96.102.18.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resqmta-c2p-570216.sys.comcast.net with ESMTPS id CznwuAOOdJBiaD6euu9K4z; Thu, 08 May 2025 19:11:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcastmailservice.net; s=20211018a; t=1746731513; bh=OhYq0g72qLnse5RVTx9A6cr8DTLtkHo6M9uKreM4Qaw=; h=Received:Received:From:To:Subject:Date:Message-ID:MIME-Version: Xfinity-Spam-Result; b=VFwQJSX0GNGm+WSpZOFV2xwdduSIOE0tpGCrtuK8+l2FO8gI4lq2+oTZi8HbYvjH8 1AO3ok1Zxue6chSb+MMqB8eSCWagOt7j15xR9xniSsyJBkyfcQfLlhdy8z3UrcKWpy lHhmvrKDjYuBvA9JqBqNPIqeOwaO4L5Rr+3vKYwmaWv1Ln5Jfe2CdG0VX98FkVKBpl 1sZSKmwgOpBBTk6ieF9VD88Ed8GrjA+xF1sFQD+W+oW7gXejc8lgW6LM37YE52Ujd+ ns+MZTO4u0TNdqXpWGi9HlavrdOjimFQK826RpKKNQ2eVv5Vp2AWXpJLLChkJ1/WUH j+8RvZVDMC+GQ== Received: from lambda.localdomain ([75.70.122.243]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resomta-c2p-555441.sys.comcast.net with ESMTPSA id D6esus4F5xefiD6esuO7fS; Thu, 08 May 2025 19:11:51 +0000 From: Stephen Cuka To: development@lists.ipfire.org Cc: Stephen Cuka Subject: [PATCH] functions.pl: Reformat pakfire Usage: text. Date: Thu, 8 May 2025 13:11:19 -0600 Message-ID: <20250508191119.3248230-1-stephen@firemypi.org> X-Mailer: git-send-email 2.43.0 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfIb2fzeuKoRjbNhbvM4gu05HcuZkfnU63rowmTV4lFYoUDY9H1+7tedJ67/E082D000OBMCZCF6YX6e/wB0oLHWjN9Dj/K6EcZGztVzXOUVsw9dPGL1l xqaru8FnG14UaWJmevPAb/QT+jLg3BFBMpmNBc142zqWz8T0Gcz2wC2xeaaBj7iJjFwgmJAJZtfXf5Mayrj07eL/M4kvjNyzbg08vSvslGijooF6NVh5JlFB 0A+FwDhvDCjqTyrkliKbfw== X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4ZthZk3BrLz2SF X-Spamd-Result: default: False [0.18 / 11.00]; HFILTER_HELO_5(3.00)[resqmta-c2p-570216.sys.comcast.net]; BAYES_HAM(-2.79)[99.09%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; IP_REPUTATION_HAM(-0.22)[asn: 7922(-0.21), country: US(-0.01), ip: 2001:558:fd00:56::(0.00)]; R_DKIM_ALLOW(-0.20)[comcastmailservice.net:s=20211018a]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[firemypi.org]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[75.70.122.243:received]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_REPUTATION(0.00)[0]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:7922, ipnet:2001:558::/29, country:US]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[comcastmailservice.net:+]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; R_SPF_NA(0.00)[no SPF record] X-Rspamd-Action: no action - Reformat pakfire Usage: text to make it clearer. - Add '-f | --force' to Usage:. Signed-off-by: Stephen Cuka --- src/pakfire/lib/functions.pl | 38 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) 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 { } 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; } -- 2.43.0