Fix newline being included after WSL path conversion

Seeker14491 · Jun 12, 2021 · f5c5564 · f5c5564
1 parent bd30011
commit f5c5564
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/opener/Cargo.toml b/opener/Cargo.toml
@@ -19,6 +19,7 @@ maintenance = { status = "passively-maintained" }
 version-sync = "0.9"
 
 [target.'cfg(target_os = "linux")'.dependencies]
+bstr = "0.2"
 wsl = "0.1"
 
 [target.'cfg(windows)'.dependencies]

diff --git a/opener/src/lib.rs b/opener/src/lib.rs
@@ -180,6 +180,7 @@ fn is_wsl() -> bool {
 
 #[cfg(target_os = "linux")]
 fn wsl_to_windows_path(path: &OsStr) -> Option<OsString> {
+    use bstr::ByteSlice;
     use std::os::unix::ffi::OsStringExt;
 
     let output = Command::new("wslpath")
@@ -195,7 +196,7 @@ fn wsl_to_windows_path(path: &OsStr) -> Option<OsString> {
         return None;
     }
 
-    Some(OsString::from_vec(output.stdout))
+    Some(OsString::from_vec(output.stdout.trim_end().to_vec()))
 }
 
 #[cfg(not(target_os = "linux"))]