From 2a1a595dec91552d05b2f0c6c666f14dbb301e70 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sun, 2 May 2021 21:52:02 -0700 Subject: [PATCH] add aq.server_root decl will make this a dynamic list of instances in the future --- src/cmd/aq.zig | 2 ++ src/cmd/aquila/add.zig | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig index 92ae86bafdea596331c68ba9f5321e3238dd4937..a51c2ae7ab442e399fd799b0a8accfa12e1270b4 100644 --- a/src/cmd/aq.zig +++ b/src/cmd/aq.zig @@ -10,6 +10,8 @@ pub const commands = struct { pub const add = @import("./aquila/add.zig"); }; +pub const server_root = "https://aquila.red"; + pub fn execute(args: [][]u8) !void { if (args.len == 0) { std.debug.warn("{s}\n", .{ diff --git a/src/cmd/aquila/add.zig b/src/cmd/aquila/add.zig index 870e81fee823cd705cd7b122c239731dac5c94f8..adffdef30846c3276182a234da9c00c751a9e6a6 100644 --- a/src/cmd/aquila/add.zig +++ b/src/cmd/aquila/add.zig @@ -5,6 +5,7 @@ const zfetch = @import("zfetch"); const json = @import("json"); const u = @import("./../../util/index.zig"); +const aq = @import("./../aq.zig"); // // @@ -12,7 +13,7 @@ const u = @import("./../../util/index.zig"); pub fn execute(args: [][]u8) !void { const pkg_id = args[0]; - const url = try std.mem.join(gpa, "/", &.{ "https://aquila.red", pkg_id }); + const url = try std.mem.join(gpa, "/", &.{ aq.server_root, pkg_id }); const req = try zfetch.Request.init(gpa, url, null); defer req.deinit(); @@ -58,7 +59,7 @@ pub fn execute(args: [][]u8) !void { const file_w = file.writer(); try file_w.print("\n", .{}); - try file_w.print(" - src: http https://aquila.red/{s}/v{d}.{d}.tar.gz _ {d} {d}\n", .{ pkg_id, v_maj, v_min, v_maj, v_min }); + try file_w.print(" - src: http {s}/{s}/v{d}.{d}.tar.gz _ {d} {d}\n", .{ aq.server_root, pkg_id, v_maj, v_min, v_maj, v_min }); try file_w.print(" version: {s}\n", .{v_hash}); std.log.info("Successfully added package {s}", .{pkg_id}); -- 2.54.0