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

bin/xbps-uhelper: add longopts for -CdrV

Browse Source 
also adjust help output to be more clear, and removed examples (moving
those to the manpage)
This commit is contained in:
classabbyamp 2023-02-09 00:41:48 -05:00 committed by Duncan Overbruck
parent a5cb441f45
commit 6010b9f091
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,40 +44,30 @@ usage(void)
"usage: xbps-uhelper [options] [action] [args]\n" "usage: xbps-uhelper [options] [action] [args]\n"
"\n" "\n"
" Available actions:\n" " Available actions:\n"
" binpkgarch, binpkgver, cmpver, fetch, getpkgdepname,\n" " binpkgarch, binpkgver, cmpver, getpkgdepname,\n"
" getpkgname, getpkgrevision, getpkgversion, pkgmatch, version,\n" " getpkgname, getpkgrevision, getpkgversion, pkgmatch, version,\n"
" real-version, arch, getsystemdir, getname, getversion\n" " real-version, arch, getsystemdir, getname, getversion\n"
"\n" "\n"
" Action arguments:\n" " Action arguments:\n"
" binpkgarch\t<binpkg> ...\n" " binpkgarch <binpkg> ...\n"
" binpkgver\t<binpkg> ...\n" " binpkgver <binpkg> ...\n"
" cmpver\t\t<instver> <reqver>\n" " cmpver <instver> <reqver>\n"
" getpkgdepname\t<string> ...\n" " getpkgdepname <string> ...\n"
" getpkgdepversion\t<string> ...\n" " getpkgdepversion <string> ...\n"
" getpkgname\t\t<string> ...\n" " getpkgname <string> ...\n"
" getpkgrevision\t<string> ...\n" " getpkgrevision <string> ...\n"
" getpkgversion\t<string> ...\n" " getpkgversion <string> ...\n"
" getname\t\t<string> ...\n" " getname <string> ...\n"
" getversion\t\t<string> ...\n" " getversion <string> ...\n"
" pkgmatch\t\t<pkg-version> <pkg-pattern>\n" " pkgmatch <pkg-version> <pkg-pattern>\n"
" version\t\t<pkgname> ...\n" " version <pkgname> ...\n"
" real-version\t<pkgname> ...\n" " real-version <pkgname> ...\n"
"\n" "\n"
" Options shared by all actions:\n" " Options shared by all actions:\n"
" -C\t\tPath to xbps.conf file.\n" " -C, --config Path to xbps.conf file.\n"
" -d\t\tDebugging messages to stderr.\n" " -d, --debug Debugging messages to stderr.\n"
" -r\t\t<rootdir>\n" " -r, --rootdir <rootdir>\n"
" -V\t\tPrints the xbps release version\n" " -V, --version Prints the xbps release version\n");
"\n"
" Examples:\n"
" $ xbps-uhelper cmpver 'foo-1.0_1' 'foo-2.1_1'\n"
" $ xbps-uhelper getpkgdepname 'foo>=0'\n"
" $ xbps-uhelper getpkgdepversion 'foo>=0'\n"
" $ xbps-uhelper getpkgname foo-2.0_1\n"
" $ xbps-uhelper getpkgrevision foo-2.0_1\n"
" $ xbps-uhelper getpkgversion foo-2.0_1\n"
" $ xbps-uhelper pkgmatch foo-1.0_1 'foo>=1.0'\n"
" $ xbps-uhelper version pkgname\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -107,6 +97,10 @@ main(int argc, char **argv)
char pkgname[XBPS_NAME_SIZE], *filename; char pkgname[XBPS_NAME_SIZE], *filename;
int flags = 0, c, rv = 0, i = 0; int flags = 0, c, rv = 0, i = 0;
const struct option longopts[] = { const struct option longopts[] = {
{ "config", required_argument, NULL, 'C' },
{ "debug", no_argument, NULL, 'd' },
{ "rootdir", required_argument, NULL, 'r' },
{ "version", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };