Merge pull request #111 from esp-rs/fix/windows-exports

Fix Windows exports
esp-rs · Dec 23, 2022 · 299494e · 299494e
2 parents 736627d + edb43de
commit 299494e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main.rs b/src/main.rs
@@ -466,6 +466,8 @@ fn export_environment(export_file: &PathBuf, exports: &[String]) -> Result<(), E
     info!("{} Creating export file", emoji::WRENCH);
     let mut file = File::create(export_file)?;
     for e in exports.iter() {
+        #[cfg(windows)]
+        let e = e.replace('/', r#"\"#);
         file.write_all(e.as_bytes())?;
         file.write_all(b"\n")?;
     }

diff --git a/src/toolchain/gcc.rs b/src/toolchain/gcc.rs
@@ -90,7 +90,7 @@ impl Installable for Gcc {
         #[cfg(windows)]
         exports.push(format!("$Env:PATH += \";{}\"", &self.get_bin_path()));
         #[cfg(unix)]
-        exports.push(format!("export PATH={}:$PATH", &self.get_bin_path()));
+        exports.push(format!("export PATH=\"{}:$PATH\"", &self.get_bin_path()));
 
         Ok(exports)
     }