Skip to content

Commit

Permalink
Ensure setup_features runs even when shell detection fails
Browse files Browse the repository at this point in the history
  • Loading branch information
liby committed Jan 14, 2025
1 parent 5847d2a commit f1d792c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/termio/shell_integration.zig
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn setup(
// on modern macOS due to System Integrity Protection.
if (comptime builtin.target.isDarwin()) {
if (std.mem.eql(u8, "/bin/bash", command)) {
return null;
break :shell null;
}
}

Expand All @@ -79,7 +79,7 @@ pub fn setup(
command,
resource_dir,
env,
) orelse return null;
) orelse break :shell null;
break :shell .{
.shell = .bash,
.command = new_command,
Expand Down Expand Up @@ -110,7 +110,7 @@ pub fn setup(
};
}

return null;
break :shell null;
};

// Setup our feature env vars
Expand Down

0 comments on commit f1d792c

Please sign in to comment.