mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-15 05:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: some random things (#8521)

Browse Source 
* swaggin

* fix(bun_shim_impl): support exe names that are shorter than four characters

* hi

* a
This commit is contained in:
dave caruso
2024-01-29 10:50:24 -08:00
committed by GitHub
parent eaea6dea54
commit bc7e7027e4
26 changed files with 1000 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/cli/run_command.zig
View File

@@ -271,6 +271,7 @@ pub const RunCommand = struct {
env: *DotEnv.Loader,
passthrough: []const string,
silent: bool,
use_native_shell: bool,
) !bool {
const shell_bin = findShell(env.map.get("PATH") orelse "", cwd) orelse return error.MissingShell;
@@ -303,6 +304,28 @@ pub const RunCommand = struct {
combined_script = combined_script_buf;
}
if (Environment.isWindows and !use_native_shell) {
if (!silent) {
if (Environment.isDebug) {
Output.prettyError("[bun shell] ", .{});
}
Output.prettyErrorln("<r><d><magenta>$<r> <d><b>{s}<r>", .{combined_script});
Output.flush();
}
const mini = bun.JSC.MiniEventLoop.initGlobal(env);
bun.shell.InterpreterMini.initAndRunFromSource(mini, name, combined_script) catch |err| {
if (!silent) {
Output.prettyErrorln("<r><red>error<r>: Failed to run script <b>{s}<r> due to error <b>{s}<r>", .{ name, @errorName(err) });
}
Output.flush();
Global.exit(1);
};
return true;
}
var argv = [_]string{
shell_bin,
if (Environment.isWindows) "/c" else "-c",
@@ -324,7 +347,13 @@ pub const RunCommand = struct {
child_process.stdin_behavior = .Inherit;
child_process.stdout_behavior = .Inherit;
const result = child_process.spawnAndWait() catch |err| {
if (Environment.isWindows) {
try @import("../child_process_windows.zig").spawnWindows(&child_process);
} else {
try child_process.spawn();
}
const result = child_process.wait() catch |err| {
if (!silent) {
Output.prettyErrorln("<r><red>error<r>: Failed to run script <b>{s}<r> due to error <b>{s}<r>", .{ name, @errorName(err) });
}
@@ -1249,6 +1278,7 @@ pub const RunCommand = struct {
this_bundler.env,
&.{},
ctx.debug.silent,
ctx.debug.use_native_shell,
)) {
return false;
}
@@ -1262,6 +1292,7 @@ pub const RunCommand = struct {
this_bundler.env,
passthrough,
ctx.debug.silent,
ctx.debug.use_native_shell,
)) return false;
temp_script_buffer[0.."post".len].* = "post".*;
@@ -1275,6 +1306,7 @@ pub const RunCommand = struct {
this_bundler.env,
&.{},
ctx.debug.silent,
ctx.debug.use_native_shell,
)) {
return false;
}