Skip to content

Commit 961bcd3

Browse files
authored
Merge pull request #236 from clubby789/cwd-script
Try running script from working directory
2 parents e93577c + 3180735 commit 961bcd3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/toolchains.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,13 @@ impl Toolchain {
238238
.join(&format!("target-{}", self.rustup_name())),
239239
);
240240
}
241+
let script = cfg
242+
.args
243+
.script
244+
.as_ref()
245+
.map(|script| std::env::current_dir().unwrap().join(script));
241246

242-
let mut cmd = match (cfg.args.script.as_ref(), cfg.args.timeout) {
247+
let mut cmd = match (script, cfg.args.timeout) {
243248
(Some(script), None) => {
244249
let mut cmd = Command::new(script);
245250
cmd.env("RUSTUP_TOOLCHAIN", self.rustup_name());

0 commit comments

Comments
 (0)