aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Colin McDonnell <colinmcd94@gmail.com> 2023-08-15 18:19:36 -0700
committerGravatar Colin McDonnell <colinmcd94@gmail.com> 2023-08-21 17:49:58 -0700
commit94e5823bbdbe8dce8b2a50c80671aba062a6bcfd (patch)
treee48f7331e29ae32a75ceb7975ee38a9153eac84c
parent8a3f85c81a0db9bae40ed366263dbf997304f9a8 (diff)
downloadbun-94e5823bbdbe8dce8b2a50c80671aba062a6bcfd.tar.gz
bun-94e5823bbdbe8dce8b2a50c80671aba062a6bcfd.tar.zst
bun-94e5823bbdbe8dce8b2a50c80671aba062a6bcfd.zip
Fix priority order
-rw-r--r--src/cli.zig12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cli.zig b/src/cli.zig
index 97aaa3713..c0de8ae4f 100644
--- a/src/cli.zig
+++ b/src/cli.zig
@@ -299,27 +299,27 @@ pub const Arguments = struct {
if (comptime cmd.readGlobalConfig()) brk: {
if (ctx.has_loaded_global_config) break :brk;
- if (getRootBunfigPath(&config_buf)) |path| {
+ if (getRootBunJSONPath(&config_buf)) |path| {
Output.debug("trying to load {s}\n", .{path});
const success = loadConfigPath(allocator, true, path, ctx, comptime cmd) catch false;
if (success) {
- Output.debug("successfully loaded global bunfig\n", .{});
+ Output.debug("successfully loaded global bun.json\n", .{});
ctx.has_loaded_global_config = true;
break :brk;
} else {
- Output.debug("failed to load global bunfig\n", .{});
+ Output.debug("failed to load global bun.json\n", .{});
}
}
- if (getRootBunJSONPath(&config_buf)) |path| {
+ if (getRootBunfigPath(&config_buf)) |path| {
Output.debug("trying to load {s}\n", .{path});
const success = loadConfigPath(allocator, true, path, ctx, comptime cmd) catch false;
if (success) {
- Output.debug("successfully loaded global bun.json\n", .{});
+ Output.debug("successfully loaded global bunfig\n", .{});
ctx.has_loaded_global_config = true;
break :brk;
} else {
- Output.debug("failed to load global bun.json\n", .{});
+ Output.debug("failed to load global bunfig\n", .{});
}
}
}