Skip to content

Commit

Permalink
Change from relative to absolute paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewianda
ewianda committed Jan 29, 2025
1 parent 672f785 commit 4fe7796
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
8 changes: 7 additions & 1 deletion lib/private/modify_mtree.awk
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Edits mtree files. See the modify_mtree macro in /lib/tar.bzl.
function make_relative_link(symlink, target) {
command = "realpath -s --relative-to=\"" symlink "\" \"" target "\""
command | getline relative
return relative
}
{
if (strip_prefix != "") {
if ($1 == strip_prefix) {
Expand Down Expand Up @@ -121,7 +126,8 @@ END {
linked_to = resolved_path
}
# Adjust the line for symlink using the map we created
new_line = field0 " type=link link=" linked_to
relative_link_to = make_relative_link(field0, linked_to)
new_line = field0 " type=link link=" relative_link_to
print new_line
} else {
# Print the original line if no symlink adjustment was needed
Expand Down
10 changes: 5 additions & 5 deletions lib/tests/tar/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ assert_tar_listing(
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin -> lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/executable.sh",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin -> ../native_binary_bin.runfiles/_main/lib/tests/tar/executable.sh",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib",
Expand All @@ -600,14 +600,14 @@ assert_tar_listing(
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]/node_modules",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]/node_modules/a",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]/node_modules/a/package.json -> lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]/node_modules/a/package.json",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]/node_modules/a/package.json -> ../../../../[email protected]/node_modules/a/package.json",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/a",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/a/package.json -> lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/.pnpm/[email protected]/node_modules/a/package.json",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/node_modules/a/package.json -> ../../.pnpm/[email protected]/node_modules/a/package.json",
"drwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/dir",
"-rwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/dir/a",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/dir/b -> lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/dir/a",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/dir/b -> ../a",
"-rwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/executable.sh",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/native_binary_bin -> lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/executable.sh",
"l--------- 0 0 0 0 Dec 31 1969 lib/tests/tar/native_binary_bin.runfiles/_main/lib/tests/tar/native_binary_bin -> ../executable.sh",
"-rwxr-xr-x 0 0 0 0 Jan 1 2023 lib/tests/tar/native_binary_bin.runfiles/_repo_mapping",
],
)

0 comments on commit 4fe7796

Please sign in to comment.