make "default" command fail for non-existent compilers

marler8997 · Nov 6, 2021 · 4f090a0 · 4f090a0
1 parent 1395661
commit 4f090a0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/test.zig b/test.zig
@@ -47,6 +47,16 @@ pub fn main() !void {
         try passOrDumpAndThrow(result);
         try testing.expect(std.mem.containsAtLeast(u8, result.stdout, 1, "master"));
     }
+    {
+        const result = try runCaptureOuts(allocator, ".", zigup_args ++ &[_][]const u8 {"default", "0.5.0"});
+        defer { allocator.free(result.stdout); allocator.free(result.stderr); }
+        dumpExecResult(result);
+        switch (result.term) {
+            .Exited => |code| try testing.expectEqual(@as(u8, 1), code),
+            else => |term| std.debug.panic("unexpected exit {}", .{term}),
+        }
+        try testing.expect(std.mem.containsAtLeast(u8, result.stderr, 1, "Error: compiler '0.5.0' is not installed\n"));
+    }
     try runNoCapture(".", zigup_args ++ &[_][]const u8 {"0.5.0"});
     {
         const result = try runCaptureOuts(allocator, ".", zigup_args ++ &[_][]const u8 {"default"});

diff --git a/zigup.zig b/zigup.zig
@@ -295,7 +295,7 @@ pub fn main2() !u8 {
             if (std.mem.eql(u8, version_string, "master")) {
                 @panic("set default to master not implemented");
             } else {
-                try setDefaultCompiler(allocator, compiler_dir);
+                try setDefaultCompiler(allocator, compiler_dir, .verify_existence);
             }
             return 0;
         }
@@ -356,7 +356,7 @@ fn fetchCompiler(allocator: *Allocator, version_arg: []const u8, set_default: Se
         }
     }
     if (set_default == .set_default) {
-        try setDefaultCompiler(allocator, compiler_dir);
+        try setDefaultCompiler(allocator, compiler_dir, .existence_verified);
     }
 }
 
@@ -623,7 +623,22 @@ fn printDefaultCompiler(allocator: *Allocator) !void {
     }
 }
 
-fn setDefaultCompiler(allocator: *Allocator, compiler_dir: []const u8) !void {
+const ExistVerify = enum { existence_verified, verify_existence };
+
+fn setDefaultCompiler(allocator: *Allocator, compiler_dir: []const u8, exist_verify: ExistVerify) !void {
+    switch (exist_verify) {
+        .existence_verified => {},
+        .verify_existence => {
+            (std.fs.openDirAbsolute(compiler_dir, .{}) catch |err| switch (err) {
+                error.FileNotFound => {
+                    std.debug.print("Error: compiler '{s}' is not installed\n", .{std.fs.path.basename(compiler_dir)});
+                    return error.AlreadyReported;
+                },
+                else => |e| return e,
+            }).close();
+        },
+    }
+
     const path_link = try makeZigPathLinkString(allocator);
     defer allocator.free(path_link);
     const link_target = try std.fs.path.join(allocator, &[_][]const u8{ compiler_dir, "files", "zig" ++ builtin.target.exeFileExt() });