diff options
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 20 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_delete.1 | 13 |
5 files changed, 30 insertions, 14 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm index 723957639d0..863add6e2a5 100644 --- a/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm +++ b/usr.sbin/pkg_add/OpenBSD/ProgressMeter.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: ProgressMeter.pm,v 1.2 2004/10/18 13:29:14 espie Exp $ +# $OpenBSD: ProgressMeter.pm,v 1.3 2004/11/14 11:58:43 espie Exp $ # # Copyright (c) 2004 Marc Espie <espie@openbsd.org> # @@ -72,7 +72,6 @@ sub set_header if (!defined $isatty) { $isatty = -t STDERR; } - find_window_size(); } if ($isatty) { find_window_size(); diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index e9da38a81e6..3c1e4243488 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.118 2004/11/13 15:00:48 espie Exp $ +# $OpenBSD: pkg_add,v 1.119 2004/11/14 11:58:43 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -617,7 +617,7 @@ $state->{very_verbose} = $opt_v >= 2; $state->{verbose} = $opt_v; $state->{beverbose} = $opt_n || ($opt_v >= 2); -if ($opt_x && !$state->{beverbose}) { +if (!$opt_x && !$state->{beverbose}) { OpenBSD::ProgressMeter::enable(); } diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index 2220029d2d1..53da6510896 100644 --- a/usr.sbin/pkg_add/pkg_add.1 +++ b/usr.sbin/pkg_add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_add.1,v 1.21 2004/11/11 12:15:28 espie Exp $ +.\" $OpenBSD: pkg_add.1,v 1.22 2004/11/14 11:58:43 espie Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -25,7 +25,7 @@ .Nd install software package distributions .Sh SYNOPSIS .Nm pkg_add -.Op Fl aInrv +.Op Fl acqInrvx .Op Fl A Ar arch .Op Fl B Ar pkg-destdir .Op Fl Q Ar quick-destdir @@ -119,13 +119,18 @@ The options are as follows: .Bl -tag -width keyword .It Fl a Automated package installation, do not record packages as installed manually. -.It Fl v -Turn on verbose output. +.It Fl c +While replacing packages, delete extra configuration file in the old package, +mentioned as +.Dl @extra file +in the packing-list. .It Fl I If scripts exist for a given package, do not execute them. .It Fl n Don't actually install a package, just report the steps that would be taken if it was. +.It Fl q +Replace package quickly, do not bother checking md5s before removing files. .It Fl r Allow replacing existing packages. This is an experimental option for now: @@ -134,6 +139,13 @@ proceed before removing the old package and adding the new one, and it should also handle shared libraries correctly. But this functionality has seen very little testing yet, and since it is rather powerful, it can break a system in a thorough way. +.It Fl v +Turn on verbose output. +Several +.Fl v +turn on more verbose output. +.It Fl x +Disable progress-meter. .It Fl A Ar arch Assume .Ar arch diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete index d135a909367..55d2c122802 100644 --- a/usr.sbin/pkg_add/pkg_delete +++ b/usr.sbin/pkg_add/pkg_delete @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_delete,v 1.76 2004/11/14 11:40:08 espie Exp $ +# $OpenBSD: pkg_delete,v 1.77 2004/11/14 11:58:43 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -72,7 +72,7 @@ $state->{dont_run_scripts} = $opt_I; $state->{forced} = \%forced; $ENV{'PKG_DELETE_EXTRA'} = $state->{extra} ? "Yes" : "No"; -if ($opt_x && !$state->{beverbose}) { +if (!$opt_x && !$state->{beverbose}) { OpenBSD::ProgressMeter::enable(); } diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1 index 119ca4c145a..146ddc5bc71 100644 --- a/usr.sbin/pkg_add/pkg_delete.1 +++ b/usr.sbin/pkg_add/pkg_delete.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_delete.1,v 1.10 2004/10/11 13:10:25 espie Exp $ +.\" $OpenBSD: pkg_delete.1,v 1.11 2004/11/14 11:58:43 espie Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -25,7 +25,7 @@ .Nd a utility for deleting previously installed software package distributions .Sh SYNOPSIS .Nm pkg_delete -.Op Fl cDInqv +.Op Fl cDInqvx .Op Fl B Ar pkg-destdir .Op Fl f Ar keys .Ar pkgname Op Ar ... @@ -57,8 +57,6 @@ The options are as follows: Set .Ar pkg-destdir as the prefix to prepend to any object deleted. -.It Fl v -Turn on verbose output. .It Fl I If scripts exist for a given package, do not execute them. .It Fl n @@ -86,6 +84,13 @@ Delete extra configuration file, mentioned as in the packing-list. .It Fl q Delete package quickly, do not bother checking md5s before removing files. +.It Fl v +Turn on verbose output. +Several +.Fl v +turn on more verbose output. +.It Fl x +Disable progress-meter. .El .Sh TECHNICAL DETAILS .Nm |