1 files changed, 8 insertions, 2 deletions

diff --git a/src/subcommand.zig b/src/subcommand.zig
index 8fde170..6a6259e 100644
--- a/src/subcommand.zig
+++ b/src/subcommand.zig
@@ -21,7 +21,9 @@ pub fn SubCommand(comptime template: type) type {
         ++ template.params);
 
         pub fn help(name: []const u8) !void {
-            const writer = std.io.getStdErr().writer();
+            var buf: [1024]u8 = undefined;
+            var stderr = std.fs.File.stderr().writer(&buf);
+            const writer = &stderr.interface;
             try writer.print("USAGE: zup {s} ", .{name});
             try clap.usage(writer, clap.Help, &params);
             try writer.writeAll("\n\n");
@@ -33,6 +35,7 @@ pub fn SubCommand(comptime template: type) type {
                 .spacing_between_parameters = 0,
             });
             try writer.writeAll("\n" ++ template.description ++ "\n");
+            return writer.flush();
         }
 
         pub fn main(name: []const u8, config: Config, args: *ArgIterator) !void {
@@ -43,7 +46,10 @@ pub fn SubCommand(comptime template: type) type {
                 .allocator = allocator,
                 .diagnostic = &diag,
             }) catch |err| {
-                diag.report(std.io.getStdErr().writer(), err) catch {};
+                var buf: [1024]u8 = undefined;
+                var stderr = std.fs.File.stderr().writer(&buf);
+                diag.report(&stderr.interface, err) catch {};
+                stderr.interface.flush() catch {};
                 try help(name);
                 return err;
             };