diff options
Diffstat (limited to 'crates/shirabe/src/downloader')
| -rw-r--r-- | crates/shirabe/src/downloader/gzip_downloader.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/src/downloader/path_downloader.rs | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs index 3ddca2a4..962c5bb8 100644 --- a/crates/shirabe/src/downloader/gzip_downloader.rs +++ b/crates/shirabe/src/downloader/gzip_downloader.rs @@ -90,7 +90,11 @@ impl ArchiveDownloader for GzipDownloader { .unwrap_or(""), PATHINFO_FILENAME, ); - let target_filepath = format!("{}{}{}", path, std::path::MAIN_SEPARATOR, filename); + let target_filepath = std::path::Path::new(path) + .join(&filename) + .into_os_string() + .into_string() + .unwrap(); if !Platform::is_windows() { let command = vec![ diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs index 4be835cd..6a496c6a 100644 --- a/crates/shirabe/src/downloader/path_downloader.rs +++ b/crates/shirabe/src/downloader/path_downloader.rs @@ -380,12 +380,11 @@ impl DownloaderInterface for PathDownloader { { let absolute_path = if !self.inner.filesystem.borrow_mut().is_absolute_path(&path) { - format!( - "{}{}{}", - Platform::get_cwd(false)?, - std::path::MAIN_SEPARATOR, - path - ) + std::path::Path::new(&Platform::get_cwd(false)?) + .join(&path) + .into_os_string() + .into_string() + .unwrap() } else { path.clone() }; |