diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-06-16 09:29:38 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-06-16 09:29:38 +0000 |
| commit | 5f0af5a6151621e365e01d103ec8c80f20fd74ac (patch) | |
| tree | 882757f72b8485f33ec9cd9bdbd69fb019c381eb /usr.sbin/pkg_add/OpenBSD/PackageRepository.pm | |
| parent | 5ba6b2ba2df8fc791ddaed159225dbbcdf674cf5 (diff) | |
use OpenBSD::Paths contents
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/PackageRepository.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageRepository.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm index 9aea21681a2..979bc5ddc2b 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepository.pm,v 1.45 2007/06/12 09:53:36 espie Exp $ +# $OpenBSD: PackageRepository.pm,v 1.46 2007/06/16 09:29:37 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -28,6 +28,7 @@ package OpenBSD::PackageRepository; our @ISA=(qw(OpenBSD::PackageRepositoryBase)); use OpenBSD::PackageLocation; +use OpenBSD::Paths; sub _new { @@ -214,7 +215,7 @@ sub open_pipe return $fh; } else { open STDERR, ">/dev/null"; - exec {"/usr/bin/gzip"} + exec {OpenBSD::Paths->gzip} "gzip", "-d", "-c", @@ -275,7 +276,7 @@ sub open_pipe return $fh; } else { open STDERR, ">/dev/null"; - exec {"/usr/bin/gzip"} + exec {OpenBSD::Paths->gzip} "gzip", "-d", "-c", @@ -372,7 +373,7 @@ sub open_pipe open(STDIN, '<&', $rdfh) or die "Bad dup"; close($rdfh); close($wrfh); - exec {"/usr/bin/gzip"} + exec {OpenBSD::Paths->gzip} "gzip", "-d", "-c", @@ -432,8 +433,7 @@ our %distant = (); sub grab_object { my ($self, $object) = @_; - my $ftp = defined $ENV{'FETCH_CMD'} ? $ENV{'FETCH_CMD'} : "/usr/bin/ftp"; - exec {$ftp} + exec {OpenBSD::Paths->ftp} "ftp", "-o", "-", $self->url($object->{name}) |