Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9a27c4f
Revert "Remove the -n option from pkg create, it was inconsistent"
Baptiste Daroussin committed 6 years ago
commit 9a27c4f849f891fe7dcc8934cfd0f07b65a05ad0
parent 8346f70
3 files changed +11 -8
modified docs/pkg-create.8
@@ -24,7 +24,7 @@
.\" ---------------------------------------------------------------------------

.Sh SYNOPSIS

.Nm
- 
.Op Fl qv
+ 
.Op Fl nqv

.Op Fl f Ar format

.Op Fl l Ar level

.Op Fl o Ar outdir
@@ -33,7 +33,7 @@
.Op Fl t Ar timestamp

.Fl m Ar metadatadir

.Nm
- 
.Op Fl qv
+ 
.Op Fl nqv

.Op Fl f Ar format

.Op Fl l Ar level

.Op Fl o Ar outdir
@@ -49,7 +49,7 @@
.Op Fl t Ar timestamp

.Ar pkg-name ...

.Nm
- 
.Op Fl qv
+ 
.Op Fl nqv

.Op Fl f Ar format

.Op Fl l Ar level

.Op Fl o Ar outdir
@@ -221,6 +221,8 @@ or
options.

.It Fl t Ar timestamp , Cm --timestamp

Set the timestamp of the files within the archive.
+ 
.It Fl n , Cm --no-clobber
+ 
Do not overwrite already existing packages.

.It Fl o Ar outdir , Cm --out-dir Ar outdir

Set

.Ar outdir
modified scripts/completion/_pkg.in
@@ -288,6 +288,7 @@ _pkg_args() {
			_arguments -A '-*' -s \

				'(-q --quiet)'{-q,--quiet}'[force quiet output]' \

				'(-v --verbose)'{-v,--verbose}'[be verbose]' \
+ 
				'(-n --no-clobber)'{-n,--no-clobber}"[don't overwrite existing packages]" \

				'(-f --format)'{-f+,--format=}'[specify package output format]:format:(tar tgz tbz txz tzst)' \

				'(-l --level)'{-l+,--level=}'[specify compression level]:level:(integer fast best)' \

				'(-o --out-dir)'{-o+,--out-dir=}'[output directory]:outdir:_files -/' \
modified src/create.c
@@ -63,13 +63,13 @@ struct pkg_entry *pkg_head = NULL;
void

usage_create(void)

{
- 
	fprintf(stderr, "Usage: pkg create [-Ohqv] [-f format] [-l level] "
+ 
	fprintf(stderr, "Usage: pkg create [-Ohnqv] [-f format] [-l level] "

		"[-o outdir] [-p plist] [-r rootdir] -m metadatadir\n");
- 
	fprintf(stderr, "Usage: pkg create [-Ohqv] [-f format] [-l level] "
+ 
	fprintf(stderr, "Usage: pkg create [-Ohnqv] [-f format] [-l level] "

		"[-o outdir] [-r rootdir] -M manifest\n");
- 
	fprintf(stderr, "       pkg create [-Ohgqvx] [-f format] [-l level] "
+ 
	fprintf(stderr, "       pkg create [-Ohgnqvx] [-f format] [-l level] "

		"[-o outdir] [-r rootdir] pkg-name ...\n");
- 
	fprintf(stderr, "       pkg create [-Ohqv] [-f format] [-l level] "
+ 
	fprintf(stderr, "       pkg create [-Ohnqv] [-f format] [-l level] "

		"[-o outdir] [-r rootdir] -a\n\n");

	fprintf(stderr, "For more information see 'pkg help create'.\n");

}
@@ -206,7 +206,7 @@ exec_create(int argc, char **argv)
		{ NULL,		0,			NULL,	0   },

	};
- 
	while ((ch = getopt_long(argc, argv, "+aghxf:l:r:m:M:o:p:qvt:", longopts, NULL)) != -1) {
+ 
	while ((ch = getopt_long(argc, argv, "+aghxf:l:r:m:M:no:p:qvt:", longopts, NULL)) != -1) {

		switch (ch) {

		case 'a':

			match = MATCH_ALL;