diff --git a/deps.zig b/deps.zig index 53df69d529b67878c5d3e105a8891647c3e35fa9..ddba06287724050562ecf35d108a296d2f69071e 100644 --- a/deps.zig +++ b/deps.zig @@ -66,11 +66,11 @@ pub fn fetch(exe: *std.Build.Step.Compile) *std.Build.Step { step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "014971d4b1e327a5c61322c3a6b9369fd1863864").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses", "bc1cd51625c13d6c7df819fd0d85968e617f5c57").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses-text", "a9d067c3c4d6c226a1de5531b66785bc15d869ee").step); - step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-nfs", "ca10dac88432ed0145b43d47c27a04ad7e4858c9").step); + step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-nfs", "1163f0e7be1400c7e2f80b5719114a7d1dc2cd36").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-nio", "61cf2b1af033a83ec2137e21824a8afa01318388").step); - step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-darwin", "b96e8bad94f53d5f426a32f237d9e8346f51b8f2").step); + step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-darwin", "b349aa32b55aae4cf2ae56740003f8aff0394920").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-freebsd", "a80eaba4499e56256ed2d42959fed5174b1fbf60").step); - step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-linux", "1b61f4f86230a8980f3b7f30c5876b09064a5a09").step); + step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-linux", "24cc89eb39fbb1f8b4caa53beeca1c785ce78546").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-netbsd", "5ad432ca421c59099be3630b9d0dda49e8bef0a7").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-sys-openbsd", "1a77f0cfe55b5fdfa6ac2bedf587bb3b8015c357").step); step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "cacde79ed6c866a370dd58f97ed1baa31b0b2c35").step); @@ -235,9 +235,9 @@ pub const package_data = struct { .entry = "/git/github.com/nektro/zig-licenses-text/a9d067c3c4d6c226a1de5531b66785bc15d869ee/src/lib.zig", }; pub var _73bukkeci2u6 = Package{ - .store = "/git/github.com/nektro/zig-sys-darwin/b96e8bad94f53d5f426a32f237d9e8346f51b8f2", + .store = "/git/github.com/nektro/zig-sys-darwin/b349aa32b55aae4cf2ae56740003f8aff0394920", .name = "sys-darwin", - .entry = "/git/github.com/nektro/zig-sys-darwin/b96e8bad94f53d5f426a32f237d9e8346f51b8f2/sys_darwin.zig", + .entry = "/git/github.com/nektro/zig-sys-darwin/b349aa32b55aae4cf2ae56740003f8aff0394920/sys_darwin.zig", }; pub var _qfev2g50alvp = Package{ .store = "/git/github.com/nektro/zig-sys-freebsd/a80eaba4499e56256ed2d42959fed5174b1fbf60", @@ -245,9 +245,9 @@ pub const package_data = struct { .entry = "/git/github.com/nektro/zig-sys-freebsd/a80eaba4499e56256ed2d42959fed5174b1fbf60/freebsd.zig", }; pub var _h7tv7ayhffak = Package{ - .store = "/git/github.com/nektro/zig-sys-linux/1b61f4f86230a8980f3b7f30c5876b09064a5a09", + .store = "/git/github.com/nektro/zig-sys-linux/24cc89eb39fbb1f8b4caa53beeca1c785ce78546", .name = "sys-linux", - .entry = "/git/github.com/nektro/zig-sys-linux/1b61f4f86230a8980f3b7f30c5876b09064a5a09/mod.zig", + .entry = "/git/github.com/nektro/zig-sys-linux/24cc89eb39fbb1f8b4caa53beeca1c785ce78546/mod.zig", }; pub var _uvkgl6xf1azv = Package{ .store = "/git/github.com/nektro/zig-sys-netbsd/5ad432ca421c59099be3630b9d0dda49e8bef0a7", @@ -278,9 +278,9 @@ pub const package_data = struct { .deps = &[_]*Package{ &_f7dubzb7cyqe, &_h7tv7ayhffak, &_73bukkeci2u6, &_kscsl0145t7x, &_qfev2g50alvp, &_uvkgl6xf1azv, &_4rmxgmcykiba }, }; pub var _vph9l0hxpeze = Package{ - .store = "/git/github.com/nektro/zig-nfs/ca10dac88432ed0145b43d47c27a04ad7e4858c9", + .store = "/git/github.com/nektro/zig-nfs/1163f0e7be1400c7e2f80b5719114a7d1dc2cd36", .name = "nfs", - .entry = "/git/github.com/nektro/zig-nfs/ca10dac88432ed0145b43d47c27a04ad7e4858c9/nfs.zig", + .entry = "/git/github.com/nektro/zig-nfs/1163f0e7be1400c7e2f80b5719114a7d1dc2cd36/nfs.zig", .deps = &[_]*Package{ &_h7tv7ayhffak, &_kscsl0145t7x, &_iecwp4b3bsfm, &_73bukkeci2u6, &_qfev2g50alvp, &_uvkgl6xf1azv, &_4rmxgmcykiba }, }; pub var _2ovav391ivak = Package{ diff --git a/src/common.zig b/src/common.zig index 5378e7f69edff0688c8a5510f1984bd2c32107a9..281ac856e190aa574757474657f53ea526b56acc 100644 --- a/src/common.zig +++ b/src/common.zig @@ -316,6 +316,26 @@ pub fn gen_files_package(alloc: std.mem.Allocator, cachepath: string, mdir: nfs. if (p.type == .DIR) { continue; } + if (p.type == .LNK) { + const parent = try dir.openDirC(std.fs.path.dirname(p.path).?, .{}); + defer parent.close(); + var buf: [1024]u8 = undefined; + const link_path = try dir.readlink(p.path, &buf); + const link_stat = try parent.statFile(link_path); + if (link_stat.kind() == .DIR) { + const link = try parent.openDir(link_path, .{}); + var walker2 = try link.walk(alloc); + defer walker2.deinit(); + while (try walker2.next()) |p2| { + if (p2.type == .DIR) { + continue; + } + const path = try nio.fmt.allocPrint(alloc, "{s}/{s}", .{ p.path, p2.path }); + try map.put(path, try nio.fmt.allocPrint(alloc, "{s}/{s}", .{ dir_path, path })); + } + continue; + } + } const path = try alloc.dupe(u8, p.path); try map.put(path, try nio.fmt.allocPrint(alloc, "{s}/{s}", .{ dir_path, path })); } diff --git a/zigmod.lock b/zigmod.lock index 8d6d9d799dbe96d2757645a30d8ca8f1e22286a7..f8b1e8db32fe7c299cc9a7025f615126e662a215 100644 --- a/zigmod.lock +++ b/zigmod.lock @@ -11,11 +11,11 @@ git https://github.com/nektro/zig-json commit-60425cbb04ce4b00edfad895771e5bd402 git https://github.com/nektro/zig-leven commit-014971d4b1e327a5c61322c3a6b9369fd1863864 git https://github.com/nektro/zig-licenses commit-bc1cd51625c13d6c7df819fd0d85968e617f5c57 git https://github.com/nektro/zig-licenses-text commit-a9d067c3c4d6c226a1de5531b66785bc15d869ee -git https://github.com/nektro/zig-nfs commit-ca10dac88432ed0145b43d47c27a04ad7e4858c9 +git https://github.com/nektro/zig-nfs commit-1163f0e7be1400c7e2f80b5719114a7d1dc2cd36 git https://github.com/nektro/zig-nio commit-61cf2b1af033a83ec2137e21824a8afa01318388 -git https://github.com/nektro/zig-sys-darwin commit-b96e8bad94f53d5f426a32f237d9e8346f51b8f2 +git https://github.com/nektro/zig-sys-darwin commit-b349aa32b55aae4cf2ae56740003f8aff0394920 git https://github.com/nektro/zig-sys-freebsd commit-a80eaba4499e56256ed2d42959fed5174b1fbf60 -git https://github.com/nektro/zig-sys-linux commit-1b61f4f86230a8980f3b7f30c5876b09064a5a09 +git https://github.com/nektro/zig-sys-linux commit-24cc89eb39fbb1f8b4caa53beeca1c785ce78546 git https://github.com/nektro/zig-sys-netbsd commit-5ad432ca421c59099be3630b9d0dda49e8bef0a7 git https://github.com/nektro/zig-sys-openbsd commit-1a77f0cfe55b5fdfa6ac2bedf587bb3b8015c357 git https://github.com/nektro/zig-time commit-cacde79ed6c866a370dd58f97ed1baa31b0b2c35