From 8cc1a3808b91e81d5904f727058413e082eed91f Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Tue, 19 Jul 2022 22:56:37 +0300 Subject: Maintenance commit --- libs/clap | 2 +- src/Installation.zig | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/clap b/libs/clap index ac5f465..996821a 160000 --- a/libs/clap +++ b/libs/clap @@ -1 +1 @@ -Subproject commit ac5f46541ca47d3db9df0fcef3cc61731adaefab +Subproject commit 996821a3e1f186c9e5cdfd971d742c9815ea590e diff --git a/src/Installation.zig b/src/Installation.zig index 031b59a..5efe128 100644 --- a/src/Installation.zig +++ b/src/Installation.zig @@ -76,10 +76,13 @@ pub fn getInstalledList(allocator: Allocator) !Installations { var zup_data = try xdg.openDataHome(allocator, "zup"); defer zup_data.close(); + var zup_data_iterable = try zup_data.openIterableDir(".", .{}); + defer zup_data_iterable.close(); + var installations = Installations.init(allocator); errdefer Installation.deinitMap(allocator, &installations); - var it = zup_data.iterate(); + var it = zup_data_iterable.iterate(); while (try it.next()) |item| { if (item.kind != .Directory) { continue; @@ -131,7 +134,7 @@ pub fn isInstalled(allocator: Allocator, name: []const u8) !bool { pub fn getAvailableList(config: Config) !Installations { const allocator = config.allocator; - + var json_str = try curl.easyDownload(allocator, "https://ziglang.org/download/index.json"); defer allocator.free(json_str); @@ -165,7 +168,7 @@ pub fn getAvailableList(config: Config) !Installations { fn parseInstallation(config: Config, name: []const u8, value: JsonValue) !?Installation { const allocator = config.allocator; - + if (value != .Object) { return error.JsonSchema; } -- cgit v1.2.3