prt-auf: expand the documentation of --install-root

This commit is contained in:
2023-06-09 14:03:36 -04:00
parent a76248a9cb
commit 64a5505821
2 changed files with 23 additions and 10 deletions

View File

@@ -213,9 +213,9 @@ sub parse_args {
} elsif ($arg eq "-fi") { $opkg{aargs} .= " -f";
} elsif ($arg =~ /^(-uf|-if|-us|-is|-ns|-kw)$/) { $opkg{margs} .= " $1";
} elsif ($arg =~ /^--margs=(.+)/) { $opkg{margs} .= $1;
} elsif (($arg =~ /^--install-root=(.+)$/) and (-d $1)) { $altroot=$1;
} elsif (($arg =~ /^--aargs=(-r|--root)=(.+)/) and (-d $2)) { $altroot=$2;
} elsif (($arg =~ /^--rargs=(-r|--root)=(.+)/) and (-d $2)) { $altroot=$2;
} elsif ($arg =~ /^--install-root=(.+)$/) { $altroot=$1;
} elsif ($arg =~ /^--aargs=(-r|--root)=(.+)/) { $altroot=$2;
} elsif ($arg =~ /^--rargs=(-r|--root)=(.+)/) { $altroot=$2;
} elsif ($arg =~ /^--aargs=(.+)/) { $opkg{aargs} .= " $1";
} elsif ($arg =~ /^--rargs=(.+)/) { $opkg{rargs} .= " $1";
} elsif ($arg =~ /^-/) {
@@ -434,6 +434,7 @@ sub get_pkgfile_fields {
if (($Version =~ m/\$\(.*\)/) or ($Version =~ m/`.*`/)) {
open(ECHO,"-|","bash -c \'source $pkgfile; echo \$version\'");
while(<ECHO>) { chomp; $Version = $_; }
close(ECHO);
}
$Dependencies =~ s/, / /g; $Dependencies =~ s/,/ /g;
@@ -764,7 +765,7 @@ sub up_inst { # returns scalar references to five arrays
$pvars{'%p'} = find_port_by_name($t,1,1,0); $pdirs{$t} = $pvars{'%p'};
$pvars{'%v'} = $1 if ( $V_REPO{$t} =~ m/(.+)-[0-9]+$/ );
$pvars{'%r'} = $1 if ( $V_REPO{$t} =~ m/-([0-9]+)$/ );
$builtpkg{$t} = ($PKG_DIR) ? "$PKG_DIR/$t#$pvars{'%v'}-$pvars{'%r'}.pkg.tar.$COMPRESSION" : "$pvars{'%p'}/$t#$pvars{'%v'}-$pvars{'%r'}.pkg.tar.$COMPRESSION";
$builtpkg{$t} = ($PKG_DIR ne "") ? "$PKG_DIR/$t#$pvars{'%v'}-$pvars{'%r'}.pkg.tar.$COMPRESSION" : "$pvars{'%p'}/$t#$pvars{'%v'}-$pvars{'%r'}.pkg.tar.$COMPRESSION";
$builtpkg{$t} =~ s/uuiName/$t/g;
$builtpkg{$t} =~ s/uuiVer/$pvars{'%v'}/g;
$builtpkg{$t} =~ s/uuiRel/$pvars{'%r'}/g;
@@ -852,11 +853,11 @@ sub parse_pkgmk_conf {
my @pkgmkVars;
my $heredoc = "bash -c 'name=uuiName; version=uuiVer;";
$heredoc .= "release=uuiRel; source /etc/pkgmk.conf; ";
$heredoc .= "printf \"%s\\t%s\" \"\$PKGMK_PACKAGE_DIR\" ";
$heredoc .= "printf \"%s:%s\" \"\$PKGMK_PACKAGE_DIR\" ";
$heredoc .= "\$PKGMK_COMPRESSION_MODE;'";
open (CF,"-|",$heredoc) or return;
while (<CF>) { @pkgmkVars = split /\t/;
while (<CF>) { @pkgmkVars = split /:/;
} close (CF);
my $COMPRESSION = ($pkgmkVars[1] eq "") ? "gz" : $pkgmkVars[1];