From c7650267c0dbc69dcd61fd8a0d922e1dcba818dd Mon Sep 17 00:00:00 2001
From: Meghan <hello@nektro.net>
Date: Sat, 28 Nov 2020 12:42:21 -0800
Subject: [PATCH] switch back to using deps folder

---
 src/cmd_fetch.zig | 6 +++---
 src/cmd_sum.zig   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cmd_fetch.zig b/src/cmd_fetch.zig
index e86299522c009f0b2d254145348b2da6c4e29e48..1c6b6b36c0bc6cb7063ee19af6516666bb82dac7 100644
--- a/src/cmd_fetch.zig
+++ b/src/cmd_fetch.zig
@@ -10,7 +10,7 @@ const u = @import("./util/index.zig");
 pub fn execute(args: [][]u8) !void {
     //
     const home = try known_folders.getPath(gpa, .home);
-    const dir = try std.fs.path.join(gpa, &[_][]const u8{home.?, ".cache", "zigmod"});
+    const dir = try std.fs.path.join(gpa, &[_][]const u8{home.?, ".cache", "zigmod", "deps"});
 
     const top_module = try fetch_deps(dir, "./zig.mod");
 
@@ -23,7 +23,7 @@ pub fn execute(args: [][]u8) !void {
     try w.print("const build = std.build;\n", .{});
     try w.print("\n", .{});
     try w.print("const home = \"{}\";\n", .{home});
-    try w.print("const cache = home ++ \"/.cache/zigmod\";\n", .{});
+    try w.print("const cache = home ++ \"/.cache/zigmod/deps\";\n", .{});
     try w.print("\n", .{});
     try w.print("{}\n", .{
         \\pub fn addAllTo(exe: *build.LibExeObjStep) void {
@@ -64,7 +64,7 @@ fn fetch_deps(dir: []const u8, mpath: []const u8) anyerror!u.Module {
     const moduledeps = &std.ArrayList(u.Module).init(gpa);
     var moddir: []const u8 = undefined;
     for (m.deps) |d| {
-        const p = try u.concat(&[_][]const u8{dir, "/deps/", try d.clean_path()});
+        const p = try u.concat(&[_][]const u8{dir, "/", try d.clean_path()});
         const pv = try u.concat(&[_][]const u8{dir, "/v/", try d.clean_path(), "/", d.version});
         u.print("fetch: {}: {}: {}", .{m.name, @tagName(d.type), d.path});
         moddir = p;
diff --git a/src/cmd_sum.zig b/src/cmd_sum.zig
index 1f0acce9231036fa84f40dfe94b106389439e543..4ac265a1ae49217bfd3f7ecc43266f53464a006c 100644
--- a/src/cmd_sum.zig
+++ b/src/cmd_sum.zig
@@ -11,7 +11,7 @@ const common = @import("./common.zig");
 pub fn execute(args: [][]u8) !void {
     //
     const home = try known_folders.getPath(gpa, .home);
-    const dir = try std.fs.path.join(gpa, &[_][]const u8{home.?, ".cache", "zigmod"});
+    const dir = try std.fs.path.join(gpa, &[_][]const u8{home.?, ".cache", "zigmod", "deps"});
     const top_module = try common.collect_deps(dir, "./zig.mod");
     
     //
-- 
2.54.0