diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-10-11 13:10:26 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-10-11 13:10:26 +0000 |
| commit | 9b7b12904f5b8227132d59903f79006335b6306a (patch) | |
| tree | 9d2daa440782dd99b5503f66db26e0b2abd6ec32 /usr.sbin/pkg_add/OpenBSD/PackingElement.pm | |
| parent | d7b201cb907c0b369c6b145f6dc9dedf58b07d3c (diff) | |
common code for all script running.
Common option for not running scripts: -I for both pkg_add and pkg_delete.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/PackingElement.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index a6328086e07..0ed55e2fdb5 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.48 2004/10/11 10:30:34 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.49 2004/10/11 13:10:25 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -963,9 +963,9 @@ our %fonts_todo = (); sub install { - my ($self, $archive, $destdir, $verbose, $not) = @_; - $self->SUPER::install($archive, $destdir, $verbose, $not); - $fonts_todo{$destdir.$self->fullname()} = 1; + my ($self, $state) = @_; + $self->SUPER::install($state); + $fonts_todo{$state->{destdir}.$self->fullname()} = 1; } sub reload @@ -1065,6 +1065,30 @@ package OpenBSD::PackingElement::FCONTENTS; our @ISA=qw(OpenBSD::PackingElement::SpecialFile); sub category() { OpenBSD::PackageInfo::CONTENTS } +package OpenBSD::PackingElement::ScriptFile; +our @ISA=qw(OpenBSD::PackingElement::SpecialFile); +use OpenBSD::Error; + +sub run +{ + my ($self, $state, @args) = @_; + + my $dir = $state->{dir}; + my $verbose = $state->{verbose}; + my $not = $state->{not}; + my $pkgname = $state->{pkgname}; + my $name = $self->{name}; + + return if $state->{dont_run_scripts}; + + main::ensure_ldconfig($verbose) unless $not; + print $self->beautify(), " script: $dir$name $pkgname ", join(' ', @args), "\n" if $state->{beverbose}; + return if $not; + chmod 0755, $dir.$name; + return if System($dir.$name, $pkgname, @args) == 0; + Fatal $self->beautify()." script borked"; +} + package OpenBSD::PackingElement::FCOMMENT; our @ISA=qw(OpenBSD::PackingElement::SpecialFile); sub category() { OpenBSD::PackageInfo::COMMENT } @@ -1074,16 +1098,19 @@ our @ISA=qw(OpenBSD::PackingElement::SpecialFile); sub category() { OpenBSD::PackageInfo::DESC } package OpenBSD::PackingElement::FINSTALL; -our @ISA=qw(OpenBSD::PackingElement::SpecialFile); +our @ISA=qw(OpenBSD::PackingElement::ScriptFile); sub category() { OpenBSD::PackageInfo::INSTALL } +sub beautify() { "Install" } package OpenBSD::PackingElement::FDEINSTALL; -our @ISA=qw(OpenBSD::PackingElement::SpecialFile); +our @ISA=qw(OpenBSD::PackingElement::ScriptFile); sub category() { OpenBSD::PackageInfo::DEINSTALL } +sub beautify() { "Deinstall" } package OpenBSD::PackingElement::FREQUIRE; -our @ISA=qw(OpenBSD::PackingElement::SpecialFile); +our @ISA=qw(OpenBSD::PackingElement::ScriptFile); sub category() { OpenBSD::PackageInfo::REQUIRE } +sub beautify() { "Require" } package OpenBSD::PackingElement::FREQUIRED_BY; our @ISA=qw(OpenBSD::PackingElement::SpecialFile); |