Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for 3rd party index #155

Merged
merged 1 commit into from
Dec 16, 2024
Merged

add support for 3rd party index #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions zigup.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const archive_ext = if (builtin.os.tag == .windows) "zip" else "tar.xz";

var global_optional_install_dir: ?[]const u8 = null;
var global_optional_path_link: ?[]const u8 = null;
var global_download_index_url: []const u8 = default_download_index_url;

var global_enable_log = true;
fn loginfo(comptime fmt: []const u8, args: anytype) void {
Expand Down Expand Up @@ -265,6 +266,8 @@ pub fn main2() !u8 {
if (!std.fs.path.isAbsolute(global_optional_path_link.?)) {
global_optional_path_link = try toAbsolute(allocator, global_optional_path_link.?);
}
} else if (std.mem.eql(u8, "--index", arg)) {
global_download_index_url = try getCmdOpt(args, &i);
} else if (std.mem.eql(u8, "-h", arg) or std.mem.eql(u8, "--help", arg)) {
help();
return 0;
Expand Down Expand Up @@ -426,10 +429,11 @@ fn fetchCompiler(allocator: Allocator, version_arg: []const u8, set_default: Set
// this step for all other versions because the version to URL mapping is fixed (see getDefaultUrl)
const is_master = std.mem.eql(u8, version_arg, "master");
const version_url = blk: {
if (!is_master)
// For default index_url we can build the url so we avoid downloading the index
if (!is_master and std.mem.eql(u8, default_download_index_url, global_download_index_url))
break :blk VersionUrl{ .version = version_arg, .url = try getDefaultUrl(allocator, version_arg) };
optional_download_index = try fetchDownloadIndex(allocator);
const master = optional_download_index.?.json.value.object.get("master").?;
const master = optional_download_index.?.json.value.object.get(version_arg).?;
const compiler_version = master.object.get("version").?.string;
const master_linux = master.object.get(json_platform).?;
const master_linux_tarball = master_linux.object.get("tarball").?.string;
Expand All @@ -454,7 +458,7 @@ fn fetchCompiler(allocator: Allocator, version_arg: []const u8, set_default: Set
}
}

const download_index_url = "https://ziglang.org/download/index.json";
const default_download_index_url = "https://ziglang.org/download/index.json";

const DownloadIndex = struct {
text: []u8,
Expand All @@ -466,10 +470,10 @@ const DownloadIndex = struct {
};

fn fetchDownloadIndex(allocator: Allocator) !DownloadIndex {
const text = switch (downloadToString(allocator, download_index_url)) {
const text = switch (downloadToString(allocator, global_download_index_url)) {
.ok => |text| text,
.err => |err| {
std.log.err("download '{s}' failed: {s}", .{ download_index_url, err });
std.log.err("download '{s}' failed: {s}", .{ global_download_index_url, err });
return error.AlreadyReported;
},
};
Expand Down
Loading