From 06224058292754d1a8665303c2a1fe798d9d3498 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 27 Feb 2024 12:09:43 -0500 Subject: [PATCH] bin/xbps-query: separate -R and --repository this allows --repository instead of --repository= --- bin/xbps-query/main.c | 13 +++++++------ bin/xbps-query/xbps-query.1 | 26 +++++++++++++------------- data/_xbps | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/bin/xbps-query/main.c b/bin/xbps-query/main.c index 55e74819..de7fa968 100644 --- a/bin/xbps-query/main.c +++ b/bin/xbps-query/main.c @@ -46,9 +46,9 @@ usage(bool fail) " -M, --memory-sync Remote repository data is fetched and stored\n" " in memory, ignoring on-disk repodata archives\n" " -p, --property PROP[,...] Show properties for PKGNAME\n" - " -R, --repository Enable repository mode. This mode explicitly\n" + " -R Enable repository mode. This mode explicitly\n" " looks for packages in repositories\n" - " --repository= Enable repository mode and add repository\n" + " --repository Enable repository mode and add repository\n" " to the top of the list. This option can be\n" " specified multiple times\n" " --regex Use Extended Regular Expressions to match\n" @@ -93,7 +93,7 @@ main(int argc, char **argv) { "list-orphans", no_argument, NULL, 'O' }, { "ownedby", no_argument, NULL, 'o' }, { "property", required_argument, NULL, 'p' }, - { "repository", optional_argument, NULL, 'R' }, + { "repository", required_argument, NULL, 4 }, { "rootdir", required_argument, NULL, 'r' }, { "show", no_argument, NULL, 'S' }, { "search", no_argument, NULL, 's' }, @@ -169,9 +169,6 @@ main(int argc, char **argv) show_prop = true; break; case 'R': - if (optarg != NULL) { - xbps_repo_store(&xh, optarg); - } repo_mode = true; break; case 'r': @@ -207,6 +204,10 @@ main(int argc, char **argv) case 3: list_repolock = opmode = true; break; + case 4: + xbps_repo_store(&xh, optarg); + repo_mode = true; + break; case '?': default: usage(true); diff --git a/bin/xbps-query/xbps-query.1 b/bin/xbps-query/xbps-query.1 index b4c36418..e162a60e 100644 --- a/bin/xbps-query/xbps-query.1 +++ b/bin/xbps-query/xbps-query.1 @@ -109,8 +109,8 @@ section. Enable repository mode. This mode explicitly looks in repositories, rather than looking in the target root directory. -.It Fl -repository=url -Appends the specified repository to the top of the list. +.It Fl -repository Ar url +Enables repository mode and adds the specified repository to the top of the list. The .Ar url argument expects a URL to the repository for remote repositories or @@ -190,7 +190,7 @@ Lists packages that are in repolock mode. See the .Em PACKAGE MODES section for more information. -.It Fl o, Fl -ownedby Ar PATTERN [ Fl -repository ] [ Fl -regex ] +.It Fl o, Fl -ownedby Ar PATTERN [ Fl R ] [ Fl -regex ] Search for installed package files by matching .Ar PATTERN . The @@ -203,22 +203,22 @@ or an Extended Regular Expression as explained in .Fl -regex option is set). If the -.Fl -repository +.Fl R option is set, the matched .Ar PATTERN in repositories will be shown. -.It Fl S, Fl -show Ar PKG [ Fl -repository ] [ Fl -property Ar PROP ] +.It Fl S, Fl -show Ar PKG [ Fl R ] [ Fl -property Ar PROP ] Shows information of an installed package. This is the default mode if no other mode is set. If the -.Fl -repository +.Fl R option is set, the matched .Ar PKG in repositories will be shown. If a package property is specified with .Fl -property, only that property will be shown. -.It Fl s, Fl -search Ar PATTERN [ Fl -repository ] [ Fl -property Ar PROP ] [ Fl -regex ] +.It Fl s, Fl -search Ar PATTERN [ Fl R ] [ Fl -property Ar PROP ] [ Fl -regex ] Search for packages by matching .Ar PATTERN on its @@ -238,30 +238,30 @@ all packages matching against .Ar PROP will be shown. -.It Fl f, Fl -files Ar PKG [ Fl -repository ] +.It Fl f, Fl -files Ar PKG [ Fl R ] Show the package files for .Ar PKG . If the -.Fl -repository +.Fl R option is set, the matched .Ar PKG in repositories will be shown. -.It Fl x, Fl -deps Ar PKG [ Fl -repository ] +.It Fl x, Fl -deps Ar PKG [ Fl R ] Show the required dependencies for .Ar PKG . Only direct dependencies are shown. To see a full dependency tree, also set .Fl -fulldeptree . If the -.Fl -repository +.Fl R option is set, the matched .Ar PKG in repositories will be shown. -.It Fl X, Fl -revdeps Ar PKG [ Fl -repository ] +.It Fl X, Fl -revdeps Ar PKG [ Fl R ] Show the reverse dependencies for .Ar PKG . If the -.Fl -repository +.Fl R option is set, the matched .Ar PKG in repositories will be shown. diff --git a/data/_xbps b/data/_xbps index 449f6cc0..ca054457 100644 --- a/data/_xbps +++ b/data/_xbps @@ -154,7 +154,7 @@ _xbps_query() { {-p,--property=-}'[Show properties]:property:($_xbps_properties)' \ --regex'[Use Extended Regular Expressions to match]' \ --fulldeptree'[Full dependency tree for -x/--deps]' \ - {-R,--repository}'[Enable repository mode]' \ + -R'[Enable repository mode]' \ '*'--repository=-'[Add repository to the top of the list]:repository url:_files -/' \ - '(mode)' \ {-l,--list-pkgs}'[List installed packages]' \