ALPHA: wire is a tool to deploy nixos systems
wire.althaea.zone/
Revert "surround drv in qoutes in build phase command" (#476)
authored by
marshmallow
and committed by
GitHub
bf92f655
97ed4bb8
+5
-5
-2
CHANGELOG.md
-2
CHANGELOG.md
···
21
21
22
22
### Fixed
23
23
24
-
- Some host shells, like fish, would break the `build` phase command. The
25
-
problematic string is now surrounded in quotes.
26
24
- Status bar is cleaned every time after execution is completed.
27
25
- Fixed garnix docs links in documentation.
28
26
- Forces `bash` instead of remote user's potentially unsupported shell. This bug
+5
-3
crates/core/src/hive/steps/build.rs
+5
-3
crates/core/src/hive/steps/build.rs
···
8
8
use crate::{
9
9
HiveLibError,
10
10
commands::{
11
-
CommandArguments, Either, WireCommandChip, builder::CommandStringBuilder, run_command,
11
+
CommandArguments, Either, WireCommandChip, builder::CommandStringBuilder,
12
+
run_command_with_env,
12
13
},
13
14
hive::node::{Context, ExecuteStep, SharedTarget},
14
15
};
···
39
40
"--no-link",
40
41
"--print-out-paths",
41
42
]);
42
-
command_string.arg(format!("\"{top_level}\""));
43
+
command_string.arg(top_level.to_string());
43
44
44
-
let status = run_command(
45
+
let status = run_command_with_env(
45
46
&CommandArguments::new(command_string, ctx.modifiers)
46
47
// build remotely if asked for AND we arent applying locally
47
48
.execute_on_remote(self.target.clone())
48
49
.mode(crate::commands::ChildOutputMode::Nix)
49
50
.log_stdout(),
51
+
std::collections::HashMap::new(),
50
52
)
51
53
.await?
52
54
.wait_till_success()