Skip to content

Commit

Permalink
[MG repo split] fix relative paths on CLI..
Browse files Browse the repository at this point in the history
CLI expected relative paths from the legacy monorepo
  • Loading branch information
plebhash committed Jan 21, 2025
1 parent 2554f1a commit e8e1548
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions src/external_commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,7 @@ pub async fn os_command(
command.arg(arg);
}

let mut child = if args.len() == 2 && command_ == "cargo" {
command.spawn().unwrap()
} else {
command.current_dir("../../roles").spawn().unwrap()
};
let mut child = command.spawn().unwrap();
debug_assert!(child.stdout.is_some());
debug_assert!(child.stderr.is_some());
match &conditions_ {
Expand Down
2 changes: 1 addition & 1 deletion src/parser/frames.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl<'a> Frames<'a> {
// the function "message_from_id" returns a an AnyMessage from the path in
// input
let mut path = id[0].clone();
std::string::String::insert_str(&mut path, 0, "../../../../");
std::string::String::insert_str(&mut path, 0, "../../");
let message = message_from_path(&[path, id[1].clone()]);
// TODO: if a message is taken from a module, should it be allowed to have a
// replace_fields? perhaps not. In this case, check that no replace_field
Expand Down

0 comments on commit e8e1548

Please sign in to comment.