Skip to content

Improve zigup default and zigup list output #44

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

Open
iddev5 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve zigup default and zigup list output #44

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f6cdf
Improve ``zigup default`` and ``zigup list`` output
iddev5 Nov 21, 2021
9b93832
Fixed master path detection and added error for default compiler not
iddev5 Jan 26, 2022
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
46 changes: 44 additions & 2 deletions zigup.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,12 @@ fn listCompilers(allocator: Allocator) !void {
};
defer install_dir.close();

const default_compiler = try getDefaultCompiler(allocator);
defer if (default_compiler) |default| allocator.free(default);

const master_dir = try getMasterDir(allocator, &install_dir);
defer if (master_dir) |master| allocator.free(master);

const stdout = std.io.getStdOut().writer();
{
var it = install_dir.iterate();
Expand All @@ -466,7 +472,24 @@ fn listCompilers(allocator: Allocator) !void {
continue;
if (std.mem.endsWith(u8, entry.name, ".installing"))
continue;
try stdout.print("{s}\n", .{entry.name});

try stdout.print("{s}", .{entry.name});

const is_master = if (master_dir) |master|
(if (mem.eql(u8, master, entry.name)) true else false)
else false;

if (is_master) {
try stdout.writeAll(" -> master");
}

if (default_compiler) |default| {
if (mem.eql(u8, default, entry.name) or (is_master and mem.eql(u8, default, "master"))) {
try stdout.writeAll(" (default)");
}
}

try stdout.writeByte('\n');
}
}
}
Expand Down Expand Up @@ -604,7 +627,26 @@ fn printDefaultCompiler(allocator: Allocator) !void {
defer if (default_compiler_opt) |default_compiler| allocator.free(default_compiler);
const stdout = std.io.getStdOut().writer();
if (default_compiler_opt) |default_compiler| {
try stdout.print("{s}\n", .{default_compiler});
if (mem.eql(u8, default_compiler, "master")) {
const install_dir_string = try getInstallDir(allocator, .{ .create = false });
defer allocator.free(install_dir_string);

var install_dir = std.fs.openDirAbsolute(install_dir_string, .{ .iterate = true }) catch |e| switch (e) {
error.FileNotFound => return,
else => return e,
};
defer install_dir.close();

const master_dir = try getMasterDir(allocator, &install_dir);
defer if (master_dir) |master| allocator.free(master);

if (master_dir) |master| {
try stdout.print("master -> {s}\n", .{master});
}
}
else {
try stdout.print("{s}\n", .{default_compiler});
}
} else {
try stdout.writeAll("<no-default>\n");
}
Expand Down