emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bin/xbps-uhelper: add getname and getversion actions

Browse Source 
these actions are kind of "meta" actions, combining getpkgdepname and
getpkgname (and the respective version actions) so that a list of mixed
pkgvers and package patterns can be interpreted. This uses the internal
format check of `xbps_pkgpattern_{name,version}()` to allow for a
fallback to `xbps_pkg_{name,version}()` for exact versions, then falls
back to displaying an error message if that also fails.
This commit is contained in:
classabbyamp 2023-02-09 18:46:39 -05:00 committed by Duncan Overbruck
parent 83e66e215a
commit 7391a7b213
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bin/xbps-uhelper/main.c
View File

@ -46,7 +46,7 @@ usage(void)
" Available actions:\n" " Available actions:\n"
" binpkgarch, binpkgver, cmpver, fetch, getpkgdepname,\n" " binpkgarch, binpkgver, cmpver, fetch, getpkgdepname,\n"
" getpkgname, getpkgrevision, getpkgversion, pkgmatch, version,\n" " getpkgname, getpkgrevision, getpkgversion, pkgmatch, version,\n"
" real-version, arch, getsystemdir\n" " real-version, arch, getsystemdir, getname, getversion\n"
"\n" "\n"
" Action arguments:\n" " Action arguments:\n"
" binpkgarch\t<binpkg> ...\n" " binpkgarch\t<binpkg> ...\n"
@ -57,6 +57,8 @@ usage(void)
" getpkgname\t\t<string> ...\n" " getpkgname\t\t<string> ...\n"
" getpkgrevision\t<string> ...\n" " getpkgrevision\t<string> ...\n"
" getpkgversion\t<string> ...\n" " getpkgversion\t<string> ...\n"
" getname\t\t<string> ...\n"
" getversion\t\t<string> ...\n"
" pkgmatch\t\t<pkg-version> <pkg-pattern>\n" " pkgmatch\t\t<pkg-version> <pkg-pattern>\n"
" version\t\t<pkgname> ...\n" " version\t\t<pkgname> ...\n"
" real-version\t<pkgname> ...\n" " real-version\t<pkgname> ...\n"
@ -257,6 +259,41 @@ main(int argc, char **argv)
printf("%s\n", version); printf("%s\n", version);
} }
} }
} else if (strcmp(argv[0], "getname") == 0) {
/* returns the name of a pkg strings or pkg patterns */
if (argc < 2)
usage();
for (i = 1; i < argc; i++) {
if (xbps_pkgpattern_name(pkgname, sizeof(pkgname), argv[i]) ||
xbps_pkg_name(pkgname, sizeof(pkgname), argv[i])) {
printf("%s\n", pkgname);
} else {
xbps_error_printf(
"Invalid string '%s', expected <string><comparator><version> "
"or <string>-<version>_<revision>\n", argv[i]);
rv = 1;
}
}
} else if (strcmp(argv[0], "getversion") == 0) {
/* returns the version of a pkg strings or pkg patterns */
if (argc < 2)
usage();
for (i = 1; i < argc; i++) {
version = xbps_pkgpattern_version(argv[i]);
if (version == NULL) {
version = xbps_pkg_version(argv[i]);
if (version == NULL) {
xbps_error_printf(
"Invalid string '%s', expected <string><comparator><version> "
"or <string>-<version>_<revision>\n", argv[i]);
rv = 1;
continue;
}
}
printf("%s\n", version);
}
} else if (strcmp(argv[0], "binpkgver") == 0) { } else if (strcmp(argv[0], "binpkgver") == 0) {
/* Returns the pkgver of binpkg strings */ /* Returns the pkgver of binpkg strings */
if (argc < 2) if (argc < 2)