jmq/Documentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: jmq:a34fa96166b24a8ea3ad2a2b9997799574fad699
Branches Tags
jmq:master
..
compare: jmq:a9fb36fff0d435e78d55f09ee015af829a631311
Branches Tags
jmq:master

2 Commits
a34fa96166 ... a9fb36fff0

Author SHA1 Message Date
John McQuah
a9fb36fff0 prt-auf: more robust handling of whitespace in the dependency line 2023-08-19 16:42:37 -04:00
John McQuah
6bce0f06f5 pkgmeek: pass the -p flag to signify only when --public-key is given 2023-08-19 16:41:28 -04:00
2 changed files with 12 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
scripts/pkgmeek
View File

@ -464,7 +464,6 @@ check_signature() { # called from $PKGMK_ROOT in the case "when"="pre-Pkgfile",
local reqfiles=(Pkgfile); local s=0; local when="$1"; local reqfiles=(Pkgfile); local s=0; local when="$1";
local SIGNIFY_ARGS=(-C -x "$PKGMK_ROOT/.signature") local SIGNIFY_ARGS=(-C -x "$PKGMK_ROOT/.signature")
[ -n "$PKGMK_PUBLICKEY" ] || PKGMK_PUBLICKEY="$(get_repo_key public)"
if [ -f "$PKGMK_ROOT/.signature" ]; then if [ -f "$PKGMK_ROOT/.signature" ]; then
[ "$when" = "pre-Pkgfile" ] || reqfiles=(.footprint) [ "$when" = "pre-Pkgfile" ] || reqfiles=(.footprint)
while [ "$when" = "pre-build" ] && (( s < ${#_local_[@]} )); do while [ "$when" = "pre-build" ] && (( s < ${#_local_[@]} )); do
@ -474,7 +473,8 @@ check_signature() { # called from $PKGMK_ROOT in the case "when"="pre-Pkgfile",
for FILE in "${reqfiles[@]}"; do for FILE in "${reqfiles[@]}"; do
[ -e "$FILE" ] || ln -sf "$PKGMK_ROOT/$FILE" . [ -e "$FILE" ] || ln -sf "$PKGMK_ROOT/$FILE" .
done done
[ -r "$PKGMK_PUBLICKEY" ] && SIGNIFY_ARGS+=(-p "$PKGMK_PUBLICKEY") [ "$PKGMK_PUBLICKEY" ] && [ -r "$PKGMK_PUBLICKEY" ] && \
SIGNIFY_ARGS+=(-p "$PKGMK_PUBLICKEY")
/usr/bin/signify "${SIGNIFY_ARGS[@]}" "${reqfiles[@]}" 2>&1 /usr/bin/signify "${SIGNIFY_ARGS[@]}" "${reqfiles[@]}" 2>&1
else else
[ "$when" = "pre-Pkgfile" ] && echo "Pkgfile verification failed" [ "$when" = "pre-Pkgfile" ] && echo "Pkgfile verification failed"

20
scripts/prt-auf
View File

@ -448,8 +448,8 @@ sub get_pkgfile_fields {
close(ECHO); close(ECHO);
} }
$Dependencies =~ s/, / /g; $Dependencies =~ s/,/ /g; $Dependencies =~ s/,(| )/ /g;
$SoftDeps =~ s/, / /g; $SoftDeps =~ s/,/ /g; $SoftDeps =~ s/,(| )/ /g;
if (shift) { if (shift) {
return $Name, $portpath, $Version, $Release, $descrip, $Dependencies, return $Name, $portpath, $Version, $Release, $descrip, $Dependencies,
$url, $SoftDeps, $maintainer, $readme, $preInstall, $postInstall; $url, $SoftDeps, $maintainer, $readme, $preInstall, $postInstall;
@ -571,9 +571,9 @@ sub list_ports {
if ($subset eq "orphans") { if ($subset eq "orphans") {
my %not_orphans = map { $_ => 0 } @searchspace; my %not_orphans = map { $_ => 0 } @searchspace;
foreach my $port (@searchspace) { foreach my $port (@searchspace) {
map { $not_orphans{$_} = 1 } split(/[ ,]/, $DEPENDS{$port}); map { $not_orphans{$_} = 1 } split(/[ ,]+/, $DEPENDS{$port});
if ($odepends{soft} == 1) { if ($odepends{soft} == 1) {
map { $not_orphans{$_} = 1 } split(/[ ,]/, $SOFTDEPS{$port}); map { $not_orphans{$_} = 1 } split(/[ ,]+/, $SOFTDEPS{$port});
} }
} }
@found = grep { $not_orphans{$_} eq 0 } keys %V_INST; @found = grep { $not_orphans{$_} eq 0 } keys %V_INST;
@ -599,11 +599,11 @@ sub list_ports {
$ind = ($V_INST{$seed}) ? "[i]" : "[ ]"; $ind = ($V_INST{$seed}) ? "[i]" : "[ ]";
print "$ind $seed\n" if ($odepends{tree}==1); print "$ind $seed\n" if ($odepends{tree}==1);
$seen{$seed} = 1; $seen{$seed} = 1;
my @children = ($direction eq "fwd") ? split /[ ,]/, $DEPENDS{$sseed}: my @children = ($direction eq "fwd") ? split /[ ,]+/, $DEPENDS{$sseed}:
grep { " $DEPENDS{$_} " =~ / $sseed / } @searchspace; grep { " $DEPENDS{$_} " =~ / $sseed / } @searchspace;
if ($odepends{soft}==1) { if ($odepends{soft}==1) {
@fosters = ($direction eq "fwd") ? @fosters = ($direction eq "fwd") ?
grep { ($V_INST{$_}) } split /[ ,]/, $SOFTDEPS{$sseed}: grep { ($V_INST{$_}) } split /[ ,]+/, $SOFTDEPS{$sseed}:
grep { " $SOFTDEPS{$_} " =~ / $sseed / } @searchspace; grep { " $SOFTDEPS{$_} " =~ / $sseed / } @searchspace;
} }
@ -619,11 +619,11 @@ sub list_ports {
return if (($seen{$s}) and ($odepends{all} !=1)); return if (($seen{$s}) and ($odepends{all} !=1));
$seen{$s} = 1; $seen{$s} = 1;
my %curdeps = ($direction eq "fwd") ? my %curdeps = ($direction eq "fwd") ?
map {$_ => 0} split /[ ,]/, $DEPENDS{$s} : map {$_ => 0} split /[ ,]+/, $DEPENDS{$s} :
map {$_ => 0} grep { " $DEPENDS{$_} " =~ / $s / } @searchspace; map {$_ => 0} grep { " $DEPENDS{$_} " =~ / $s / } @searchspace;
if ($odepends{soft} == 1) { if ($odepends{soft} == 1) {
my @optionals = ($direction eq "fwd") ? my @optionals = ($direction eq "fwd") ?
grep { ($V_INST{$_}) } split /[ ,]/, $SOFTDEPS{$s} : grep { ($V_INST{$_}) } split /[ ,]+/, $SOFTDEPS{$s} :
grep { " $SOFTDEPS{$_} " =~ / $s / } @searchspace; grep { " $SOFTDEPS{$_} " =~ / $s / } @searchspace;
map {$curdeps{$_} = 1} @optionals; map {$curdeps{$_} = 1} @optionals;
} }
@ -717,13 +717,13 @@ sub deporder { # returns a sorted list of packages required.
push(@treewalk, $s); $imark{$s}=1; push(@treewalk, $s); $imark{$s}=1;
# assemble the list of dependencies that must be visited next # assemble the list of dependencies that must be visited next
%curdeps = map { $_ => $greedy } split /[ ,]/, $DEPENDS{$s}; %curdeps = map { $_ => $greedy } split /[ ,]+/, $DEPENDS{$s};
# if the user toggles --softdeps, consider the optional dependencies # if the user toggles --softdeps, consider the optional dependencies
# that are already installed or are given on the command line # that are already installed or are given on the command line
if ($odepends{soft} == 1) { if ($odepends{soft} == 1) {
foreach (grep { ($V_INST{$_}) or ($given{$_}) } foreach (grep { ($V_INST{$_}) or ($given{$_}) }
split /[ ,]/, $SOFTDEPS{$s}) { $curdeps{$_} = 1; } split /[ ,]+/, $SOFTDEPS{$s}) { $curdeps{$_} = 1; }
} }
foreach my $sd (keys %curdeps) { foreach my $sd (keys %curdeps) {