bitua/zigfetch
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor(macos-shell): use process.run function and new Environ

Browse Source
This commit is contained in:
utox39
2026-02-11 19:21:38 +01:00
parent d04745ad63
commit cf7b62ac90
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/linux/user.zig
View File

@@ -4,14 +4,14 @@ pub fn getUsername(allocator: std.mem.Allocator, environ: std.process.Environ) !
return try std.process.Environ.getAlloc(environ, allocator, "USER"); return try std.process.Environ.getAlloc(environ, allocator, "USER");
} }
pub fn getShell(allocator: std.mem.Allocator) ![]u8 { pub fn getShell(allocator: std.mem.Allocator, io: std.Io, environ: std.process.Environ) ![]u8 {
const shell = std.process.getEnvVarOwned(allocator, "SHELL") catch |err| if (err == error.EnvironmentVariableNotFound) { const shell = std.process.Environ.getAlloc(environ, allocator, "SHELL") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown"); return allocator.dupe(u8, "Unknown");
} else return err; } else return err;
defer allocator.free(shell); defer allocator.free(shell);
const result = try std.process.Child.run(.{ .allocator = allocator, .argv = &[_][]const u8{ shell, "--version" } }); const result = try std.process.run(allocator, io, .{ .argv = &[_][]const u8{ shell, "--version" } });
const result_stdout = result.stdout; const result_stdout = result.stdout;
if (std.mem.indexOf(u8, shell, "bash") != null) { if (std.mem.indexOf(u8, shell, "bash") != null) {