diff --git a/scripts/prt-auf b/scripts/prt-auf index ae56bc6..fa4f310 100755 --- a/scripts/prt-auf +++ b/scripts/prt-auf @@ -353,7 +353,7 @@ sub fill_hashes_from_cache { $deps = <$cf>; chomp($deps, $DESC{$p}, $V_REPO{$p}); $DEPENDS{$p} = ($deps ne "") ? $deps : " "; - $DEPENDS{$p} =~ s/,/ /g; + $DEPENDS{$p} =~ s/, / /g; $DEPENDS{$p} =~ s/,/ /g; for (my $i=6; $i<13; $i++) { $ignored = <$cf>; } } close ($cf); @@ -366,7 +366,7 @@ sub fill_hashes_from_pkgfiles { my ($rver, $rrel, $rdesc, $rdeps) = get_pkgfile_fields($pp); $V_REPO{$p} = ($rver) ? $rver : "0"; $DEPENDS{$p} = ($rdeps) ? $rdeps : ""; - $DEPENDS{$p} =~ s/,/ /g; + $DEPENDS{$p} =~ s/, / /g; $DEPENDS{$p} =~ s/,/ /g; $DESC{$p} = ($rdesc) ? $rdesc : ""; } } @@ -395,6 +395,7 @@ sub get_pkgfile_fields { else {} } close(PF); + $Dependencies =~ s/, / /g; $Dependencies =~ s/,/ /g; if (shift) { return $Name, $portpath, $Version, $Release, $descrip, $Dependencies, $url, $packager, $maintainer, $readme, $preInstall, $postInstall; @@ -693,10 +694,10 @@ sub up_inst { # returns scalar references to five arrays if (who_aliased_to($t)) { $mkcmd{$t} = "echo \"skipped build ($t provided by an alias)\""; } else { - $mkcmd{$t} = "" if ((port_diff("utd",$t)==0) and !($WANTED{$t})); - $mkcmd{$t} = "" if (($V_INST{$t}) and ($type =~ /^(install|depinst)$/) and ($opkg{$t} !~ /-f/)); $mkcmd{$t} = "echo \"skipped build ($t up to date)\"" if ((-f $builtpkg{$t}) and ((-M $builtpkg{$t}) < (-M "$pdirs{$t}/Pkgfile")) and ($opkg{$t} !~ /-f/)); + $mkcmd{$t} = "" if ((port_diff("utd",$t)==0) and !($WANTED{$t})); + $mkcmd{$t} = "" if (($V_INST{$t}) and ($type =~ /^(install|depinst)$/) and ($opkg{$t} !~ /-f/)); } if ($mkcmd{$t}) { @@ -712,7 +713,7 @@ sub up_inst { # returns scalar references to five arrays $addcmd{$t} =~ s/ -u / / if (port_diff("utd",$t)<0); ($opkg{test} eq "no") ? system("$addcmd{$t}") : print "$addcmd{$t}\n"; $status{$t} .= ( $?>>8 == 0 ) ? "pkgadd ok. " : "pkgadd failed. "; - unlink($logfile{$t}) if ((-f $logfile{$t}) and ($olog{rm_on_success} eq "yes")); + unlink($logfile{$t}) if (($logfile{$t}) and ($olog{rm_on_success} eq "yes")); } if (($status{$t} =~ /pkgadd ok/) and (-f "$pdirs{$t}/post-install") and ($opkg{runscripts} eq "yes")) { @@ -775,8 +776,8 @@ sub port_edit { my $EDITOR = ($ENV{EDITOR}) ? $ENV{EDITOR} : "/usr/bin/vi"; if ($type eq "readme") { - port_edit("cat",$pp,"README") if (-f "$pp/README"); - port_edit("cat",$pp,"README.md") if (-f "$pp/README.md"); + port_edit("cat",$port,"README") if (-f "$pp/README"); + port_edit("cat",$port,"README.md") if (-f "$pp/README.md"); } if ($type eq "edit") {