fix: master install

hendriknielaender · Nov 6, 2023 · f085ecf · f085ecf
1 parent 8e1879e
commit f085ecf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/install.zig b/src/install.zig
@@ -57,12 +57,16 @@ fn fetchVersionData(allocator: Allocator, requested_version: []const u8, sub_key
         // const key = key_ptr.*;
         if (std.mem.eql(u8, entry.key_ptr.*, requested_version)) {
             // Initialize fields with null.
+            var version: ?[]const u8 = "not_set";
             var date: ?[]const u8 = null;
             var tarball: ?[]const u8 = null;
             var shasum: ?[]const u8 = null;
 
             var valObj = entry.value_ptr.*.object.iterator();
             while (valObj.next()) |value| {
+                if (std.mem.eql(u8, value.key_ptr.*, "version")) {
+                    version = value.value_ptr.*.string;
+                }
                 if (std.mem.eql(u8, value.key_ptr.*, "date")) {
                     date = value.value_ptr.*.string;
                 } else if (std.mem.eql(u8, value.key_ptr.*, sub_key)) {
@@ -71,7 +75,8 @@ fn fetchVersionData(allocator: Allocator, requested_version: []const u8, sub_key
                     while (nestedObj.next()) |nestedValue| {
                         if (std.mem.eql(u8, nestedValue.key_ptr.*, "tarball")) {
                             tarball = nestedValue.value_ptr.*.string;
-                        } else if (std.mem.eql(u8, nestedValue.key_ptr.*, "shasum")) {
+                        }
+                        if (std.mem.eql(u8, nestedValue.key_ptr.*, "shasum")) {
                             shasum = nestedValue.value_ptr.*.string;
                         }
                     }
@@ -83,9 +88,10 @@ fn fetchVersionData(allocator: Allocator, requested_version: []const u8, sub_key
                 return Error.MissingExpectedFields;
             }
 
+            const version_name = if (std.mem.eql(u8, requested_version, "master")) version.? else requested_version;
             // Create the Version struct.
             return Version{
-                .name = try allocator.dupe(u8, requested_version),
+                .name = try allocator.dupe(u8, version_name),
                 .date = try allocator.dupe(u8, date.?),
                 .tarball = try allocator.dupe(u8, tarball.?),
                 .shasum = try allocator.dupe(u8, shasum.?),