diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2021-12-27 10:34:17 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2021-12-27 10:34:17 +0200 |
| commit | 6117de6eae69eeba6b401a231c7f60f71af152b7 (patch) | |
| tree | d01a828e89f95cdaeab102c67e215d147a3dd631 | |
| parent | f3fc0105f8c621bd1a77363cbb53f843c58100f4 (diff) | |
| download | apk-tools-6117de6eae69eeba6b401a231c7f60f71af152b7.tar.gz apk-tools-6117de6eae69eeba6b401a231c7f60f71af152b7.tar.bz2 apk-tools-6117de6eae69eeba6b401a231c7f60f71af152b7.tar.xz apk-tools-6117de6eae69eeba6b401a231c7f60f71af152b7.zip | |
list: sort options alphabetically
| -rw-r--r-- | doc/apk-list.8.scd | 24 | ||||
| -rw-r--r-- | src/app_list.c | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/doc/apk-list.8.scd b/doc/apk-list.8.scd index d41c692..7f4d724 100644 --- a/doc/apk-list.8.scd +++ b/doc/apk-list.8.scd @@ -18,26 +18,26 @@ globbing. # OPTIONS -*-I, --installed* - Consider only installed packages. - -*-O, --orphaned* - Consider only orphaned packages. - *-a, --available* Consider only available packages. -*-u, --upgradable, --upgradeable* - Consider only upgradable packages. +*-d, --depends* + List packages by dependency. + +*-I, --installed* + Consider only installed packages. + +*--manifest* + List installed packages in format `<name> <version>`. *-o, --origin* List packages by origin. -*-d, --depends* - List packages by dependency. +*-O, --orphaned* + Consider only orphaned packages. *-P, --providers* List packages by provider. -*--manifest* - List installed packages in format `<name> <version>`.
\ No newline at end of file +*-u, --upgradable, --upgradeable* + Consider only upgradable packages. diff --git a/src/app_list.c b/src/app_list.c index 9489ee6..226535d 100644 --- a/src/app_list.c +++ b/src/app_list.c @@ -183,13 +183,13 @@ static void print_result(struct apk_database *db, const char *match, struct apk_ #define LIST_OPTIONS(OPT) \ OPT(OPT_LIST_available, APK_OPT_SH("a") "available") \ - OPT(OPT_LIST_installed, APK_OPT_SH("I") "installed") \ OPT(OPT_LIST_depends, APK_OPT_SH("d") "depends") \ + OPT(OPT_LIST_installed, APK_OPT_SH("I") "installed") \ + OPT(OPT_LIST_manifest, "manifest") \ OPT(OPT_LIST_origin, APK_OPT_SH("o") "origin") \ OPT(OPT_LIST_orphaned, APK_OPT_SH("O") "orphaned") \ OPT(OPT_LIST_providers, APK_OPT_SH("P") "providers") \ OPT(OPT_LIST_upgradable, APK_OPT_SH("u") "upgradable") \ - OPT(OPT_LIST_manifest, "manifest") \ OPT(OPT_LIST_upgradeable, "upgradeable") APK_OPT_APPLET(option_desc, LIST_OPTIONS); @@ -203,11 +203,15 @@ static int option_parse_applet(void *pctx, struct apk_ctx *ac, int opt, const ch ctx->available = 1; ctx->orphaned = 0; break; + case OPT_LIST_depends: + ctx->match_depends = 1; + break; case OPT_LIST_installed: ctx->installed = 1; break; - case OPT_LIST_depends: - ctx->match_depends = 1; + case OPT_LIST_manifest: + ctx->manifest = 1; + ctx->installed = 1; break; case OPT_LIST_origin: ctx->match_origin = 1; @@ -219,10 +223,6 @@ static int option_parse_applet(void *pctx, struct apk_ctx *ac, int opt, const ch case OPT_LIST_providers: ctx->match_providers = 1; break; - case OPT_LIST_manifest: - ctx->manifest = 1; - ctx->installed = 1; - break; case OPT_LIST_upgradable: case OPT_LIST_upgradeable: ctx->available = 1; |