Skip to content

MVC to fix path issues on Windows #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MVC to fix path issues on Windows #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/shell_install/bash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,14 @@ pub fn install(si: &mut ShellInstall) -> Result<(), ShellInstallError> {
return Ok(());
}
let escaped_path = link_path.to_string_lossy().replace(' ', "\\ ");
let source_line = format!("source {}", &escaped_path);
let source_line = {
if env::consts::OS == "windows" {
// Bash on Windows doesn't like C:\Users\... but will accept "C:\Users\..."
format!("source \"{}\"", &escaped_path)
} else {
format!("source {}", &escaped_path)
}
};
for sourcing_path in &sourcing_paths {
let sourcing_path_str = sourcing_path.to_string_lossy();
if util::file_contains_line(sourcing_path, &source_line)? {
Expand Down
7 changes: 6 additions & 1 deletion src/verb/execution_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,5 +409,10 @@ mod execution_builder_test {
}

fn path_to_string<P: AsRef<Path>>(path: P) -> String {
path.as_ref().to_string_lossy().to_string()
let is_bash_on_windows = true;
Copy link
Owner

@Canop Canop Oct 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you forget something here ?

Copy link
Contributor Author

@3tilley 3tilley Oct 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, deliberately so! I have hardcoded it locally to allow me to test broot in Windows bash, and when I've done some testing I'll implement the best method.

This is more of a CTA for any similar bugs that I can fix in one shot.

if is_bash_on_windows {
format!("\"{}\"", path.as_ref().to_string_lossy().to_string())
} else {
path.as_ref().to_string_lossy().to_string()
}
}