Fix #728: fallback to copy when symlinking on windows (#763)

* Fix #728: fallback to copy when symlinking on windows

* Signature hmm?

* Squash warnings on windows

* Just don’t use generics here
This commit is contained in:
Félix Saparelli 2023-02-04 14:14:08 +13:00 committed by GitHub
parent f2fc37eea5
commit 6bc1fb4983
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions

View file

@ -1,6 +1,6 @@
use std::{
borrow::Cow,
fmt, fs,
fmt,
path::{self, Component, Path, PathBuf},
};
@ -183,7 +183,7 @@ impl BinFile {
);
#[cfg(unix)]
fs::set_permissions(
std::fs::set_permissions(
&self.source,
std::os::unix::fs::PermissionsExt::from_mode(0o755),
)?;

View file

@ -63,13 +63,15 @@ pub fn atomic_install(src: &Path, dst: &Path) -> io::Result<()> {
Ok(())
}
fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> io::Result<()> {
fn symlink_file(original: &Path, link: &Path) -> io::Result<()> {
#[cfg(target_family = "unix")]
let f = std::os::unix::fs::symlink;
#[cfg(target_family = "windows")]
let f = std::os::windows::fs::symlink_file;
std::os::unix::fs::symlink(original, link)?;
f(original, link)
// Symlinks on Windows are disabled in some editions, so creating one is unreliable.
#[cfg(target_family = "windows")]
std::os::windows::fs::symlink_file(original, link)
.or_else(|_| std::fs::copy(original, link).map(drop))?;
Ok(())
}
/// Atomically install symlink "link" to a file "dst".

View file

@ -1,4 +1,4 @@
use std::{future::pending, io};
use std::io;
use super::tasks::AutoAbortJoinHandle;
use crate::errors::BinstallError;
@ -73,7 +73,7 @@ mod unix {
Ok(())
} else {
// Use pending() here for the same reason as above.
pending().await
std::future::pending().await
}
}