From 65666d00836654f33ac4405acc12ccf50f93a071 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Thu, 23 Nov 2023 23:33:08 -0800
Subject: [PATCH] add self_name arg to all execute() call signatures

---
 src/cmd/aq.zig              | 4 ++--
 src/cmd/aquila/add.zig      | 4 +++-
 src/cmd/aquila/install.zig  | 4 +++-
 src/cmd/aquila/showjson.zig | 4 +++-
 src/cmd/aquila/update.zig   | 4 +++-
 src/cmd/ci.zig              | 3 ++-
 src/cmd/fetch.zig           | 4 +++-
 src/cmd/generate.zig        | 3 ++-
 src/cmd/init.zig            | 4 +++-
 src/cmd/license.zig         | 3 ++-
 src/cmd/sum.zig             | 3 ++-
 src/cmd/version.zig         | 3 ++-
 src/cmd/zpm.zig             | 4 ++--
 src/cmd/zpm/add.zig         | 4 +++-
 src/cmd/zpm/search.zig      | 3 ++-
 src/cmd/zpm/showjson.zig    | 4 +++-
 src/cmd/zpm/tags.zig        | 3 ++-
 src/main.zig                | 2 +-
 18 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig
index 5bfeca4fa00db15f7f3b4fdc29e6ae9f1b7b92ff..c764373e93c5376698a29e348e6600c25b3fb4b1 100644
--- a/src/cmd/aq.zig
+++ b/src/cmd/aq.zig
@@ -18,7 +18,7 @@ pub const commands = struct {
 
 pub const server_root = "https://aquila.red";
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
     if (args.len == 0) {
         std.debug.print("{s}\n", .{
             \\This is a subcommand for use with https://github.com/nektro/aquila instances but has no default behavior on its own aside from showing you this nice help text.
@@ -36,7 +36,7 @@ pub fn execute(args: [][]u8) !void {
     inline for (comptime std.meta.declarations(commands)) |decl| {
         if (std.mem.eql(u8, args[0], decl.name)) {
             const cmd = @field(commands, decl.name);
-            try cmd.execute(args[1..]);
+            try cmd.execute(self_name, args[1..]);
             return;
         }
     }
diff --git a/src/cmd/aquila/add.zig b/src/cmd/aquila/add.zig
index e738672f9f1115863732e29d97120ae6663e04d2..88b14cc4e4863050d2438d89e82be397906f0ce5 100644
--- a/src/cmd/aquila/add.zig
+++ b/src/cmd/aquila/add.zig
@@ -8,7 +8,9 @@ const aq = @import("./../aq.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     const pkg_id = args[0];
     _ = try do(std.fs.cwd(), pkg_id);
     std.log.info("Successfully added package {s}", .{pkg_id});
diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig
index aa07634de615c3ec769be044bee8e6fd1858db6a..609da856c7987035adf1116ead89f108b47a882e 100644
--- a/src/cmd/aquila/install.zig
+++ b/src/cmd/aquila/install.zig
@@ -8,7 +8,9 @@ const zigmod = @import("../../lib.zig");
 const u = @import("./../../util/index.zig");
 const common = @import("./../../common.zig");
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     const home = try knownfolders.getPath(gpa, .home);
     const homepath = home.?;
     const homedir = try std.fs.cwd().openDir(homepath, .{});
diff --git a/src/cmd/aquila/showjson.zig b/src/cmd/aquila/showjson.zig
index e08f5f2c6285c6b865a817e1d5e549cb9d73d9bb..1aab53f542387db2b9d16d545c9b25559667ea62 100644
--- a/src/cmd/aquila/showjson.zig
+++ b/src/cmd/aquila/showjson.zig
@@ -6,7 +6,9 @@ const aq = @import("./../aq.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     const out = std.io.getStdOut().writer();
 
     const url = try std.mem.join(gpa, "/", &.{ aq.server_root, args[0] });
diff --git a/src/cmd/aquila/update.zig b/src/cmd/aquila/update.zig
index 45bcc89a751a36adce9e83ef14807c847d9a1051..66a9cf5d02d499d07e0bdb2f7804d3af7a55c855 100644
--- a/src/cmd/aquila/update.zig
+++ b/src/cmd/aquila/update.zig
@@ -8,7 +8,9 @@ const zigmod = @import("../../lib.zig");
 const u = @import("./../../util/index.zig");
 const common = @import("./../../common.zig");
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     const home = try knownfolders.getPath(gpa, .home);
     const homepath = home.?;
     const homedir = try std.fs.cwd().openDir(homepath, .{});
diff --git a/src/cmd/ci.zig b/src/cmd/ci.zig
index b03bb6c584a4ec135df6ca74a7686842d98e5898..d27b3d0caa2b39b904f92728bfeacfd66605c48a 100644
--- a/src/cmd/ci.zig
+++ b/src/cmd/ci.zig
@@ -7,7 +7,8 @@ const common = @import("./../common.zig");
 // Inspired by:
 // https://docs.npmjs.com/cli/v7/commands/npm-ci
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     const gpa = std.heap.c_allocator;
diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
index 560f5f40e6fe0c9d34855cad4f3a52632fb45d72..4af122f4afc250e43b240e2ee4d4204b1a2c3265 100644
--- a/src/cmd/fetch.zig
+++ b/src/cmd/fetch.zig
@@ -10,7 +10,9 @@ const license = @import("./license.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     //
     const gpa = std.heap.c_allocator;
     const cachepath = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" });
diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig
index f70b81a9d96ae1818cdbc8c7724684388e9f91dc..d0282e7048e0ee9667d9ee2fb583e09023988f13 100644
--- a/src/cmd/generate.zig
+++ b/src/cmd/generate.zig
@@ -8,7 +8,8 @@ const common = @import("./../common.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     //
diff --git a/src/cmd/init.zig b/src/cmd/init.zig
index 13fdf161204a7d8ce426a48269005a960042695f..e215648382dae8cdff24b58ca9004919cb43c7d7 100644
--- a/src/cmd/init.zig
+++ b/src/cmd/init.zig
@@ -13,7 +13,9 @@ const u = @import("./../util/index.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     std.debug.print("This utility will walk you through creating a zigmod.yml file.\n", .{});
     std.debug.print("That will give a good launching off point to get your next project started.\n", .{});
     std.debug.print("Use `zigmod aq add <pkg>` to add a dependency from https://aquila.red/\n", .{});
diff --git a/src/cmd/license.zig b/src/cmd/license.zig
index 703f76d8d99180b9848211e84d71c9250a76feb7..a3ae38dc96478b4ee4250c7c90c27acd19b24592 100644
--- a/src/cmd/license.zig
+++ b/src/cmd/license.zig
@@ -14,7 +14,8 @@ const Map = std.StringArrayHashMap(*List);
 // Inspired by:
 // https://github.com/onur/cargo-license
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     const cachepath = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" });
diff --git a/src/cmd/sum.zig b/src/cmd/sum.zig
index 2483af21b808e5193dee4378f5e38de941a5a4cf..6e550663a28adbc5ef3f6e4608541cd5d3b705e7 100644
--- a/src/cmd/sum.zig
+++ b/src/cmd/sum.zig
@@ -7,7 +7,8 @@ const common = @import("./../common.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     const cachepath = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" });
diff --git a/src/cmd/version.zig b/src/cmd/version.zig
index aa3dbe85387f7e57999635c8e5ceca5f4af88985..4fb8d88b42058038d6b88d14dcd5036fc5027641 100644
--- a/src/cmd/version.zig
+++ b/src/cmd/version.zig
@@ -7,7 +7,8 @@ const u = @import("./../util/index.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     const root = @import("root");
diff --git a/src/cmd/zpm.zig b/src/cmd/zpm.zig
index 6b560f0cf8974e0c9ae1b919704f91d4aa5393fe..846afb3818f61a0e4bab9ed68c2dd415c373e6e5 100644
--- a/src/cmd/zpm.zig
+++ b/src/cmd/zpm.zig
@@ -29,7 +29,7 @@ pub const Package = struct {
     links: []const ?string,
 };
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
     if (args.len == 0) {
         std.debug.print("{s}\n", .{
             \\This is a subcommand for use with https://github.com/zigtools/zpm-server instances but has no default behavior on its own aside from showing you this nice help text.
@@ -48,7 +48,7 @@ pub fn execute(args: [][]u8) !void {
     inline for (comptime std.meta.declarations(commands)) |decl| {
         if (std.mem.eql(u8, args[0], decl.name)) {
             const cmd = @field(commands, decl.name);
-            try cmd.execute(args[1..]);
+            try cmd.execute(self_name, args[1..]);
             return;
         }
     }
diff --git a/src/cmd/zpm/add.zig b/src/cmd/zpm/add.zig
index 6a8d3952c0a488867c761e65aba8cf8683e980ef..1dd5ed9eb14868c4f71cc15b30717ddab4aa9575 100644
--- a/src/cmd/zpm/add.zig
+++ b/src/cmd/zpm/add.zig
@@ -9,7 +9,9 @@ const zpm = @import("./../zpm.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, "packages" });
     const val = try zpm.server_fetchArray(url);
 
diff --git a/src/cmd/zpm/search.zig b/src/cmd/zpm/search.zig
index 2358d74d6e3a9ca19fcdc74507a342176ddf31bc..af7268695bbfe598c1c6087ab0cc783fbaaa78c9 100644
--- a/src/cmd/zpm/search.zig
+++ b/src/cmd/zpm/search.zig
@@ -7,7 +7,8 @@ const zpm = @import("./../zpm.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     const out = std.io.getStdOut().writer();
diff --git a/src/cmd/zpm/showjson.zig b/src/cmd/zpm/showjson.zig
index 3bfdd8a6045e3ecf871f1964fcfb1e8a21b2d32a..e6710245feb4a60797a9eb37e5c49dfd4b59a5ef 100644
--- a/src/cmd/zpm/showjson.zig
+++ b/src/cmd/zpm/showjson.zig
@@ -6,7 +6,9 @@ const zpm = @import("./../zpm.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
+
     const out = std.io.getStdOut().writer();
 
     const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, args[0] });
diff --git a/src/cmd/zpm/tags.zig b/src/cmd/zpm/tags.zig
index 167c77a6878766ec8c92ad1f96dc55399f9fdcb2..82b0c683cac0ed3d7016a5f325e3d8955f1f8b9b 100644
--- a/src/cmd/zpm/tags.zig
+++ b/src/cmd/zpm/tags.zig
@@ -7,7 +7,8 @@ const zpm = @import("./../zpm.zig");
 //
 //
 
-pub fn execute(args: [][]u8) !void {
+pub fn execute(self_name: []const u8, args: [][]u8) !void {
+    _ = self_name;
     _ = args;
 
     const out = std.io.getStdOut().writer();
diff --git a/src/main.zig b/src/main.zig
index 28c9e6ebd05e02b538c75a0f93de36ea9b7b51d7..3106ec9d711ece6b88cc323470d780aa6e25b1a0 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -45,7 +45,7 @@ pub fn main() !void {
     inline for (comptime std.meta.declarations(zigmod.commands)) |decl| {
         if (std.mem.eql(u8, args[0], decl.name)) {
             const cmd = @field(zigmod.commands, decl.name);
-            try cmd.execute(args[1..]);
+            try cmd.execute(proc_args[0], args[1..]);
             return;
         }
     }
-- 
2.54.0