system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 10:19:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

pkg-bootstrap: complain on improper pkg bootstrap usage

Browse source 
Right now, the bootstrap will gloss over things like pkg bootstrap -x or
pkg bootstrap -f pkg. Make it more clear that this is incorrect, and hint
at the correct formatting.

Reported by:	jhb (IIRC via IRC)
Approved by:	bapt, jhb, manu
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D24750
This commit is contained in:
Kyle Evans 2020-07-22 17:33:35 +00:00
parent 94140f4781
commit ca7f7593ba
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363421
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr.sbin/pkg/pkg.c
View file

@ -1050,8 +1050,16 @@ main(int argc, char *argv[])
if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) {
bootstrap_only = true;
if (argc == 3 && strcmp(argv[2], "-f") == 0)
if (argc > 3) {
fprintf(stderr, "Too many arguments\nUsage: pkg bootstrap [-f]\n");
exit(EXIT_FAILURE);
}
if (argc == 3 && strcmp(argv[2], "-f") == 0) {
force = true;
} else if (argc == 3) {
fprintf(stderr, "Invalid argument specified\nUsage: pkg bootstrap [-f]\n");
exit(EXIT_FAILURE);
}
}
if ((bootstrap_only && force) || access(pkgpath, X_OK) == -1) {