Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Remove any reference to pkg(1) and replace them with pkg(8)
Baptiste Daroussin committed 12 years ago
commit 296de5ee5c19aa3336118a6cc89e648b245de272
parent 3bb17061fc3ba02a5252f4e8ad86b90e127eda66
5 files changed +16 -16
modified README.md
@@ -311,7 +311,7 @@ pkgng is also able to work with multiple remote repositories. In the previous se
we are using only a single remote repository, which is defined by the _PACKAGESITE_ option.



In order to be able to work with multiple remote repositories and instead of changing
- 
_PACKAGESITE_ each time, you can tell *pkg(1)* to work in multi-repos mode as well.
+ 
_PACKAGESITE_ each time, you can tell *pkg(8)* to work in multi-repos mode as well.



To do this, simply enable multi-repos in *pkg.conf(5)* like this:
modified libpkg/pkg.h.in
@@ -39,12 +39,12 @@
#include <stringlist.h>

#include <openssl/pem.h>
- 
/* The expected name of the pkg(1) binary executable. */
+ 
/* The expected name of the pkg(8) binary executable. */

#ifndef PKG_EXEC_NAME

#define PKG_EXEC_NAME	"pkg"

#endif
- 
/* The expected name of the pkg-static(1) binary */
+ 
/* The expected name of the pkg-static(8) binary */

#ifndef PKG_STATIC_NAME

#define PKG_STATIC_NAME	"pkg-static"

#endif
@@ -85,11 +85,11 @@ struct pkg_manifest_key;
struct pkg_manifest_parser;



/**
- 
 * The system-wide pkg(1) status: ie. is it a) installed or otherwise
+ 
 * The system-wide pkg(8) status: ie. is it a) installed or otherwise

 * available on the sysem, b) database (local.sqlite) initialised and

 * c) has at least one package installed (which should be pkg

 * itself). PKG_STATUS_UNINSTALLED logically cannot be returned by
- 
 * pkg(1) itself, but it can be useful for the pkg bootstrapper
+ 
 * pkg(8) itself, but it can be useful for the pkg bootstrapper

 * /usr/bin/pkg or for applications that link against libpkg.so

 */
modified pkg/main.c
@@ -140,14 +140,14 @@ usage(const char *conffile, const char *reposdir)
	fprintf(stderr, "Global options supported:\n");

	fprintf(stderr, "\t%-15s%s\n", "-d", "Increment debug level");

#ifndef NO_LIBJAIL
- 
	fprintf(stderr, "\t%-15s%s\n", "-j", "Execute pkg(1) inside a jail(8)");
+ 
	fprintf(stderr, "\t%-15s%s\n", "-j", "Execute pkg(8) inside a jail(8)");

#endif
- 
	fprintf(stderr, "\t%-15s%s\n", "-c", "Execute pkg(1) inside a chroot(8)");
+ 
	fprintf(stderr, "\t%-15s%s\n", "-c", "Execute pkg(8) inside a chroot(8)");

	fprintf(stderr, "\t%-15s%s\n", "-C", "Use the specified configuration file");

	fprintf(stderr, "\t%-15s%s\n", "-R", "Directory to search for individual repository configurations");

	fprintf(stderr, "\t%-15s%s\n", "-l", "List available commands and exit");
- 
	fprintf(stderr, "\t%-15s%s\n", "-v", "Display pkg(1) version");
- 
	fprintf(stderr, "\t%-15s%s\n\n", "-N", "Test if pkg(1) is activated and avoid auto-activation");
+ 
	fprintf(stderr, "\t%-15s%s\n", "-v", "Display pkg(8) version");
+ 
	fprintf(stderr, "\t%-15s%s\n\n", "-N", "Test if pkg(8) is activated and avoid auto-activation");

	fprintf(stderr, "Commands supported:\n");



	for (unsigned int i = 0; i < cmd_len; i++)
@@ -481,10 +481,10 @@ do_activation_test(int argc)
{

	int	count;
- 
	/* Test to see if pkg(1) has been activated.  Exit with an
+ 
	/* Test to see if pkg(8) has been activated.  Exit with an

	   error code if not.  Can be combined with -c and -j to test

	   if pkg is activated in chroot or jail. If there are no
- 
	   other arguments, and pkg(1) has been activated, show how
+ 
	   other arguments, and pkg(8) has been activated, show how

	   many packages have been installed. */



	switch (pkg_status(&count)) {
modified pkg/pkg.conf.sample
@@ -1,4 +1,4 @@
- 
# System-wide configuration file for pkg(1)
+ 
# System-wide configuration file for pkg(8)

# For more information on the file format and

# options please refer to the pkg.conf(5) man page
modified scripts/completion/_pkg.zsh.in
@@ -17,12 +17,12 @@ _pkg() {
	local subcmd_list cmd

	earlyargs=(

	'-d[Increment debug level]'
- 
	'-j[Execute pkg(1) inside a jail(8)]:jail:'
- 
	'-c[Execute pkg(1) inside a chroot(8)]:chroot:_files -/'
+ 
	'-j[Execute pkg(8) inside a jail(8)]:jail:'
+ 
	'-c[Execute pkg(8) inside a chroot(8)]:chroot:_files -/'

	'-C[Use the specified configuration file]'

	'-l[List available command and exit]'
- 
	'-v[Display pkg(1) version]'
- 
	'-N[Test if pkg(1) is activated and avoid auto-activation]'
+ 
	'-v[Display pkg(8) version]'
+ 
	'-N[Test if pkg(8) is activated and avoid auto-activation]'

	)



	subcmd=(