X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id C13C5DC6007 for ; Thu, 27 Jun 2013 19:29:10 +0000 (UTC) Received: from compute4.internal (compute4.nyi.mail.srv.osa [10.202.2.44]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 1E7BA20E83 for ; Thu, 27 Jun 2013 15:29:07 -0400 (EDT) Received: from frontend2.nyi.mail.srv.osa ([10.202.2.161]) by compute4.internal (MEProxy); Thu, 27 Jun 2013 15:29:08 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :in-reply-to:references; s=smtpout; bh=YJNRoKj4QYfq2JXJ/E5uWaM0q EY=; b=QGce9NCXY4/F4eLsXecpWepnBBhl2OHluQx7+H3UUwqCB5Ma+/ZOL4ejj ieiwCZGHAJUVrvki5zEFxIS5jR7UnS1SETvoszbqaW0Da5nNlaUcOTkEY38fEfbq wqxisZjVDU0O4seKZyVZaT28IkLMWPwtwwQhM5ODYgQ8ffjwMM= X-Sasl-enc: uiYi9+/bQqE+8UaP3MPTnGW1BEuJRXUGLnh7wKBZLVpo 1372361346 Received: from localhost (unknown [69.86.161.244]) by mail.messagingengine.com (Postfix) with ESMTPA id 41680680484 for ; Thu, 27 Jun 2013 15:29:06 -0400 (EDT) From: Dubiousjim To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH 12/15] reorder some options in usage messages Date: Thu, 27 Jun 2013 15:28:57 -0400 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- src/add.c | 2 +- src/audit.c | 4 ++-- src/info.c | 8 ++++---- src/ver.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/add.c b/src/add.c index 832e601..021b878 100644 --- a/src/add.c +++ b/src/add.c @@ -153,7 +153,6 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array } static struct apk_option add_options[] = { - { 0x10000, "initdb", "Initialize database" }, { 'U', "update-cache", "Update the repository cache first" }, { 'u', "upgrade", "Prefer to upgrade package" }, { 't', "virtual", @@ -161,6 +160,7 @@ static struct apk_option add_options[] = { "package with the listed dependencies and add that to 'world'; the " "actions of the command are easily reverted by deleting the virtual " "package", required_argument, "NAME" }, + { 0x10000, "initdb", "Initialize database" }, }; static struct apk_applet apk_add = { diff --git a/src/audit.c b/src/audit.c index fb92aff..e913020 100644 --- a/src/audit.c +++ b/src/audit.c @@ -276,12 +276,12 @@ static int audit_main(void *ctx, struct apk_database *db, struct apk_string_arra } static struct apk_option audit_options[] = { + { 'R', "recursive", "List individually all entries in new directories" }, + { 'r', NULL, "Synonym for -R (deprecated)" }, { 0x10000, "backup", "List all modified configuration files (in " "protected_paths.d) that need to be backed up" }, { 0x10001, "system", "Verify checksums of all installed non-configuration files " }, { 0x10002, "check-permissions", "Check file and directory uid/gid/mode too" }, - { 'R', "recursive", "List individually all entries in new directories" }, - { 'r', NULL, "Synonym for -R (deprecated)" }, { 0x10003, "packages", "List only the changed packages (or names only with -q)" }, }; diff --git a/src/info.c b/src/info.c index 62866eb..a68281c 100644 --- a/src/info.c +++ b/src/info.c @@ -420,18 +420,18 @@ static struct apk_option info_options[] = { { 'L', "contents", "List contents of the PACKAGE" }, { 'e', "installed", "Check if PACKAGE is installed" }, { 'W', "who-owns", "Print the package owning the specified file" }, + { 'a', "all", "Print all information about PACKAGE" }, + { 'd', "description", "Print description for PACKAGE" }, { 'D', "depends", "List packages that the PACKAGE (directly) depends on" }, { 'R', "rdepends", "List all installed packages (directly) depending on PACKAGE" }, { 'r', NULL, "Synonym for -R (deprecated)" }, + { 's', "size", "Show installed size of PACKAGE" }, + { 'w', "webpage", "Show URL for more information about PACKAGE" }, { 'P', "provides", "List virtual packages provided by PACKAGE" }, { 0x10000, "replaces", "List packages whom files PACKAGE might replace" }, { 0x10001, "install-if", "List the PACKAGE's install_if rule" }, { 'I', "rinstall-if", "List all packages having install_if referencing PACKAGE" }, - { 'w', "webpage", "Show URL for more information about PACKAGE" }, - { 's', "size", "Show installed size of PACKAGE" }, - { 'd', "description", "Print description for PACKAGE" }, { 't', "triggers", "Print active triggers of PACKAGE" }, - { 'a', "all", "Print all information about PACKAGE" }, }; static struct apk_applet apk_info = { diff --git a/src/ver.c b/src/ver.c index e15eaeb..567c15b 100644 --- a/src/ver.c +++ b/src/ver.c @@ -186,12 +186,12 @@ static int ver_main(void *pctx, struct apk_database *db, struct apk_string_array static struct apk_option ver_options[] = { { 'U', "update-cache", "Update the repository cache first" }, - { 'I', "indexes", "Print description and versions of indexes" }, - { 't', "test", "Compare two given versions, output '<' '=' or '>'" }, - { 'c', "check", "Check the given version strings, output any that are invalid" }, { 'a', "all", "Consider packages from all repository tags" }, { 'l', "limit", "Limit output to packages with status matching one of LIMCHARs", required_argument, "LIMCHARs" }, + { 'I', "indexes", "Print description and versions of indexes" }, + { 't', "test", "Compare two given versions, output '<' '=' or '>'" }, + { 'c', "check", "Check the given version strings, output any that are invalid" }, }; static struct apk_applet apk_ver = { -- 1.8.3.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---