summaryrefslogtreecommitdiff
path: root/src/Installation.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/Installation.zig')
-rw-r--r--src/Installation.zig18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Installation.zig b/src/Installation.zig
index 8218f23..6565263 100644
--- a/src/Installation.zig
+++ b/src/Installation.zig
@@ -54,10 +54,10 @@ pub fn getActiveName(allocator: Allocator) !?[]u8 {
54 } 54 }
55 }; 55 };
56 56
57 var linkpath = try bin_home.realpathAlloc(allocator, linkname); 57 const linkpath = try bin_home.realpathAlloc(allocator, linkname);
58 defer allocator.free(linkpath); 58 defer allocator.free(linkpath);
59 59
60 var zup_dir = try xdg.getDataHome(allocator, "zup"); 60 const zup_dir = try xdg.getDataHome(allocator, "zup");
61 defer allocator.free(zup_dir); 61 defer allocator.free(zup_dir);
62 62
63 const rel_path = try std.fs.path.relative(allocator, zup_dir, linkpath); 63 const rel_path = try std.fs.path.relative(allocator, zup_dir, linkpath);
@@ -79,7 +79,7 @@ pub fn getInstalledList(allocator: Allocator) !Installations {
79 var zup_data = try xdg.openDataHome(allocator, "zup"); 79 var zup_data = try xdg.openDataHome(allocator, "zup");
80 defer zup_data.close(); 80 defer zup_data.close();
81 81
82 var zup_data_iterable = try zup_data.openIterableDir(".", .{}); 82 var zup_data_iterable = try zup_data.openDir(".", .{ .iterate = true });
83 defer zup_data_iterable.close(); 83 defer zup_data_iterable.close();
84 84
85 var installations = Installations.init(allocator); 85 var installations = Installations.init(allocator);
@@ -94,7 +94,7 @@ pub fn getInstalledList(allocator: Allocator) !Installations {
94 var inst_dir = try zup_data.openDir(item.name, .{}); 94 var inst_dir = try zup_data.openDir(item.name, .{});
95 defer inst_dir.close(); 95 defer inst_dir.close();
96 96
97 var zig_exe = inst_dir.realpathAlloc(allocator, "zig") catch |err| { 97 const zig_exe = inst_dir.realpathAlloc(allocator, "zig") catch |err| {
98 if (err == error.FileNotFound) { 98 if (err == error.FileNotFound) {
99 continue; 99 continue;
100 } 100 }
@@ -102,7 +102,7 @@ pub fn getInstalledList(allocator: Allocator) !Installations {
102 }; 102 };
103 defer allocator.free(zig_exe); 103 defer allocator.free(zig_exe);
104 104
105 const res = try ChildProcess.exec(.{ .allocator = allocator, .argv = &.{ zig_exe, "version" } }); 105 const res = try ChildProcess.run(.{ .allocator = allocator, .argv = &.{ zig_exe, "version" } });
106 errdefer allocator.free(res.stdout); 106 errdefer allocator.free(res.stdout);
107 allocator.free(res.stderr); 107 allocator.free(res.stderr);
108 108
@@ -144,7 +144,7 @@ pub fn getAvailableList(config: Config) !Installations {
144 144
145 const allocator = arena.allocator(); 145 const allocator = arena.allocator();
146 146
147 var data = try EasyHttp.get(allocator, index_json_uri); 147 const data = try EasyHttp.get(allocator, index_json_uri);
148 defer allocator.free(data); 148 defer allocator.free(data);
149 149
150 const parsed = try std.json.parseFromSliceLeaky( 150 const parsed = try std.json.parseFromSliceLeaky(
@@ -167,7 +167,7 @@ pub fn getAvailableList(config: Config) !Installations {
167 if (installation_opt) |*installation| { 167 if (installation_opt) |*installation| {
168 errdefer installation.deinit(); 168 errdefer installation.deinit();
169 169
170 var name = try config.allocator.dupe(u8, kv.key_ptr.*); 170 const name = try config.allocator.dupe(u8, kv.key_ptr.*);
171 errdefer config.allocator.free(name); 171 errdefer config.allocator.free(name);
172 172
173 try installations.putNoClobber(name, installation.*); 173 try installations.putNoClobber(name, installation.*);
@@ -209,7 +209,7 @@ fn parseInstallation(config: Config, name: []const u8, value: JsonValue) !?Insta
209 if (url_src != .string) { 209 if (url_src != .string) {
210 return error.JsonSchema; 210 return error.JsonSchema;
211 } 211 }
212 var url_str = try allocator.dupe(u8, url_src.string); 212 const url_str = try allocator.dupe(u8, url_src.string);
213 errdefer allocator.free(url_str); 213 errdefer allocator.free(url_str);
214 const url = try Uri.parse(url_str); 214 const url = try Uri.parse(url_str);
215 215
@@ -222,7 +222,7 @@ fn parseInstallation(config: Config, name: []const u8, value: JsonValue) !?Insta
222 } else blk: { 222 } else blk: {
223 break :blk name; 223 break :blk name;
224 }; 224 };
225 var ver_str = try allocator.dupe(u8, version_src); 225 const ver_str = try allocator.dupe(u8, version_src);
226 errdefer allocator.free(ver_str); 226 errdefer allocator.free(ver_str);
227 const version = try SemanticVersion.parse(ver_str); 227 const version = try SemanticVersion.parse(ver_str);
228 228