073517d Add -q / --quiet option to 'pkg create' — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Add -q / --quiet option to 'pkg create'

Matthew Seaman committed 11 years ago

commit 073517dd8ddeb1d14e0f7aa629072a85a617c6aa
parent ed6c984

2 files changed +22 -10

modified docs/pkg-create.8

@@ -15,7 +15,7 @@

 .\"     @(#)pkg.8
 .\" $FreeBSD$
 .\"
 .Dd November 18, 2014
 .Dd February 1, 2015
 .Dt PKG-CREATE 8
 .Os
 .\" ---------------------------------------------------------------------------

@@ -25,26 +25,26 @@

 .\" ---------------------------------------------------------------------------
 .Sh SYNOPSIS
 .Nm
 .Op Fl n
 .Op Fl nq
 .Op Fl f Ar format
 .Op Fl o Ar outdir
 .Op Fl p Ar plist
 .Op Fl r Ar rootdir
 .Fl m Ar metadatadir
 .Nm
 .Op Fl n
 .Op Fl nq
 .Op Fl f Ar format
 .Op Fl o Ar outdir
 .Op Fl r Ar rootdir
 .Fl M Ar manifest
 .Nm
 .Op Fl gnx
 .Op Fl gnqx
 .Op Fl f Ar format
 .Op Fl o Ar outdir
 .Op Fl r Ar rootdir
 .Ar pkg-name ...
 .Nm
 .Op Fl n
 .Op Fl nq
 .Op Fl f Ar format
 .Op Fl o Ar outdir
 .Op Fl r Ar rootdir

@@ -53,6 +53,7 @@

 .Pp
 .Nm
 .Op Cm --no-clobber
 .Op Cm --quiet
 .Op Cm --format Ar format
 .Op Cm --out-dir Ar outdir
 .Op Cm --plist Ar plist

@@ -60,18 +61,21 @@

 .Cm --metadata Ar metadatadir
 .Nm
 .Op Cm --no-clobber
 .Op Cm --quiet
 .Op Cm --format Ar format
 .Op Cm --out-dir Ar outdir
 .Op Cm --root-dir Ar rootdir
 .Cm --manifest Ar manifest
 .Nm
 .Op Cm --{glob,no-clobber,regex}
 .Op Cm --quiet
 .Op Cm --format Ar format
 .Op Cm --out-dir Ar outdir
 .Op Cm --root-dir Ar rootdir
 .Ar pkg-name ...
 .Nm
 .Op Cm --no-clobber
 .Op Cm --quiet
 .Op Cm --format Ar format
 .Op Cm --out-dir Ar outdir
 .Op Cm --root-dir Ar rootdir

@@ -215,6 +219,8 @@ Only has any effect when used with

 See
 .Sx "PLIST FORMAT"
 for details.
 .It Fl q , Cm --quiet
 Force quiet output.
 .It Fl r Ar rootdir , Cm --root-dir Ar rootdir
 .Ar rootdir
 specifies the top-level directory to be treated as the root of the

modified src/create.c

@@ -2,6 +2,7 @@

  * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
  * Copyright (c) 2011-2012 Julien Laffaye <jlaffaye@FreeBSD.org>
  * Copyright (c) 2011 Will Andrews <will@FreeBSD.org>
  * Copyright (c) 2015 Matthew Seaman <matthew@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

@@ -59,13 +60,13 @@ STAILQ_HEAD(pkg_head, pkg_entry);

 void
 usage_create(void)
 {
 	fprintf(stderr, "Usage: pkg create [-On] [-f format] [-o outdir] "
 	fprintf(stderr, "Usage: pkg create [-Onq] [-f format] [-o outdir] "
 		"[-p plist] [-r rootdir] -m metadatadir\n");
 	fprintf(stderr, "Usage: pkg create [-On] [-f format] [-o outdir] "
 	fprintf(stderr, "Usage: pkg create [-Onq] [-f format] [-o outdir] "
 		"[-r rootdir] -M manifest\n");
 	fprintf(stderr, "       pkg create [-Ognx] [-f format] [-o outdir] "
 	fprintf(stderr, "       pkg create [-Ognqx] [-f format] [-o outdir] "
 		"[-r rootdir] pkg-name ...\n");
 	fprintf(stderr, "       pkg create [-On] [-f format] [-o outdir] "
 	fprintf(stderr, "       pkg create [-Onq] [-f format] [-o outdir] "
 		"[-r rootdir] -a\n\n");
 	fprintf(stderr, "For more information see 'pkg help create'.\n");
 }

@@ -181,6 +182,7 @@ cleanup:

  * -g: globbing
  * -r: rootdir for the package
  * -m: path to dir where to find the metadata
  * -q: quiet mode
  * -M: manifest file
  * -f <format>: format could be txz, tgz, tbz or tar
  * -o: output directory where to create packages by default ./ is used

@@ -211,10 +213,11 @@ exec_create(int argc, char **argv)

 		{ "out-dir",	required_argument,	NULL,	'o' },
 		{ "no-clobber", no_argument,		NULL,	'n' },
 		{ "plist",	required_argument,	NULL,	'p' },
 		{ "quiet",	no_argument,		NULL,	'q' },
 		{ NULL,		0,			NULL,	0   },
 	};
 	while ((ch = getopt_long(argc, argv, "+agxf:r:m:M:o:np:", longopts, NULL)) != -1) {
 	while ((ch = getopt_long(argc, argv, "+agxf:r:m:M:o:np:q", longopts, NULL)) != -1) {
 		switch (ch) {
 		case 'a':
 			match = MATCH_ALL;

@@ -246,6 +249,9 @@ exec_create(int argc, char **argv)

 		case 'p':
 			plist = optarg;
 			break;
 		case 'q':
 			quiet = true;
 			break;
 		default:
 			usage_create();
 			return (EX_USAGE);