diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index b80ad9e221a..04ad2a36378 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.271 2019/07/05 06:21:14 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.272 2019/10/20 09:05:58 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -1662,24 +1662,33 @@ sub reload sub update_fontalias { - my $dirname = shift; - my @aliases; + my ($state, $dirname) = @_; - if (-d "$dirname") { - for my $alias (glob "$dirname/fonts.alias-*") { - open my $f ,'<', $alias or next; - push(@aliases, <$f>); - close $f; + my $alias_name = "$dirname/fonts.alias"; + if ($state->verbose > 1) { + $state->say("Assembling #1 from #2", + $alias_name, "$alias_name-*"); + } + + if (open my $out, '>', $alias_name) { + for my $alias (glob "$alias_name-*") { + if (open my $f ,'<', $alias) { + print {$out} <$f>; + close $f; + } else { + $state->errsay("Couldn't read #1: #2", + $alias, $!); + } } - open my $f, '>', "$dirname/fonts.alias"; - print $f @aliases; - close $f; + close $out; + } else { + $state->errsay("Couldn't write #1: #2", $alias_name, $!); } } sub restore_fontdir { - my ($dirname, $state) = @_; + my ($state, $dirname) = @_; if (-f "$dirname/fonts.dir.dist") { unlink("$dirname/fonts.dir"); @@ -1702,18 +1711,18 @@ sub run_if_exists sub finish { my ($class, $state) = @_; + return if $state->{not}; + my @l = keys %{$state->{recorder}->{fonts_todo}}; + @l = grep {-d $_} @l; if (@l != 0) { require OpenBSD::Error; - return if $state->{not}; - map { update_fontalias($_) } @l; - if (-d "@l") { - run_if_exists($state, OpenBSD::Paths->mkfontscale, '--', @l); - run_if_exists($state, OpenBSD::Paths->mkfontdir, '--', @l); - map { restore_fontdir($_, $state) } @l; - } + map { update_fontalias($state, $_) } @l; + run_if_exists($state, OpenBSD::Paths->mkfontscale, '--', @l); + run_if_exists($state, OpenBSD::Paths->mkfontdir, '--', @l); + map { restore_fontdir($state, $_) } @l; run_if_exists($state, OpenBSD::Paths->fc_cache, '--', @l); } |