00dani/stow
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

find_stowed_path: rename $path / $dest to $pkg_path_from_cwd

Browse source 
$path is horribly vague, so rename to be more informative.
This commit is contained in:
Adam Spiers 2024-04-01 16:18:52 +01:00
parent 0daf352200
commit 2851b36df4
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/Stow.pm.in
View file

@ -982,12 +982,13 @@ dangling.
=back =back
Returns C<($path, $stow_path, $package)> where C<$path> and Returns C<($pkg_path_from_cwd, $stow_path, $package)> where
C<$stow_path> are relative from the top-level target directory. C<$pkg_path_from_cwd> and C<$stow_path> are relative from the
C<$path> is the full relative path to the member of the package top-level target directory. C<$pkg_path_from_cwd> is the full
pointed to by C<$link_dest>; C<$stow_path> is the relative path to the relative path to the member of the package pointed to by
stow directory; and C<$package> is the name of the package; or C<('', C<$link_dest>; C<$stow_path> is the relative path to the stow
'', '')> if link is not owned by stow. directory; and C<$package> is the name of the package; or C<('', '',
'')> if link is not owned by stow.
cwd must be the top-level target directory, otherwise cwd must be the top-level target directory, otherwise
C<find_containing_marked_stow_dir()> won't work. Allow for stow dir C<find_containing_marked_stow_dir()> won't work. Allow for stow dir
@ -1009,25 +1010,25 @@ sub find_stowed_path {
# what's actually on the filesystem, since the link might not # what's actually on the filesystem, since the link might not
# exist yet. # exist yet.
debug(4, 2, "find_stowed_path(target=$target_subpath; source=$link_dest)"); debug(4, 2, "find_stowed_path(target=$target_subpath; source=$link_dest)");
my $dest = join_paths(parent($target_subpath), $link_dest); my $pkg_path_from_cwd = join_paths(parent($target_subpath), $link_dest);
debug(4, 3, "is symlink destination $dest owned by stow?"); debug(4, 3, "is symlink destination $pkg_path_from_cwd owned by stow?");
# First check whether the link is owned by the current stow # First check whether the link is owned by the current stow
# directory, in which case $dest will be a prefix of # directory, in which case $pkg_path_from_cwd will be a prefix of
# $self->{stow_path}. # $self->{stow_path}.
my ($package, $path) = $self->link_dest_within_stow_dir($dest); my ($package, $pkg_subpath) = $self->link_dest_within_stow_dir($pkg_path_from_cwd);
if (length $package) { if (length $package) {
debug(4, 3, "yes - package $package in $self->{stow_path} may contain $path"); debug(4, 3, "yes - package $package in $self->{stow_path} may contain $pkg_subpath");
return ($dest, $self->{stow_path}, $package); return ($pkg_path_from_cwd, $self->{stow_path}, $package);
} }
# If no .stow file was found, we need to find out whether it's # If no .stow file was found, we need to find out whether it's
# owned by the current stow directory, in which case $path will be # owned by the current stow directory, in which case
# a prefix of $self->{stow_path}. # $pkg_path_from_cwd will be a prefix of $self->{stow_path}.
my ($stow_path, $ext_package) = $self->find_containing_marked_stow_dir($dest); my ($stow_path, $ext_package) = $self->find_containing_marked_stow_dir($pkg_path_from_cwd);
if (length $stow_path) { if (length $stow_path) {
debug(5, 5, "yes - $stow_path in $dest was marked as a stow dir; package=$ext_package"); debug(5, 5, "yes - $stow_path in $pkg_path_from_cwd was marked as a stow dir; package=$ext_package");
return ($dest, $stow_path, $ext_package); return ($pkg_path_from_cwd, $stow_path, $ext_package);
} }
return ('', '', ''); return ('', '', '');