diff --git a/scripts/prt-auf b/scripts/prt-auf index 6f6a7e4..2e3b5eb 100755 --- a/scripts/prt-auf +++ b/scripts/prt-auf @@ -170,18 +170,17 @@ if (($action =~ /^(listinst|listorphans|dependent)/) foreach my $k (@ok) { $note = ($ok_pre{$k}) ? " pre: ok. " : ""; $note .= ($ok_post{$k}) ? " post: ok. " : ""; - $note = ( grep /(pre|post):/, $note ) ? "($note)" : ""; - print " $k $note\n"; + ($note) ? print " $k ($note)\n" : print " $k\n"; } print "\n"; } if (@ok_readme) { print "Ports with README files:\n"; - print join("\n ", @ok_readme); + print join("\n ", @ok_readme); print "\n"; } if (@not_ok) { print "Ports with pkgmk/pkgadd failures:\n"; - print join("\n ", @not_ok); + print join("\n ", @not_ok); print "\n"; } } @@ -804,8 +803,13 @@ sub up_inst { # returns scalar references to five arrays $mkcmd{$t} = "echo \"skipped build (package already exists)\""; } if ($opkg{test} eq "yes") { - print("$t\n") if ($mkcmd{$t} !~ /skipped/); - $ok{$t}=1; + ($mkcmd{$t} !~ /skipped/) or next BUILDLOG; + print("$t"); + ("$opkg{run_scripts} $opkg{pre_install}" !~ /yes/) or + (! -f "$pdirs{$t}/pre-install") or print(" (+pre)"); + ("$opkg{run_scripts} $opkg{post_install}" !~ /yes/) or + (! -f "$pdirs{$t}/post-install") or print(" (+post)"); + print("\n"); next BUILDLOG; } if (("$opkg{run_scripts} $opkg{pre_install}" =~ /yes/) and (-f "$altroot$pdirs{$t}/pre-install")) {