Skip to content

Preserve symlinks when installing #1504

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

Merged
nrc merged 1 commit into from
Sep 18, 2018
Merged

Preserve symlinks when installing #1504

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
24 changes: 18 additions & 6 deletions src/rustup-utils/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,24 @@ pub fn copy_dir(src: &Path, dest: &Path, notify_handler: &Fn(Notification)) -> R
}

pub fn copy_file(src: &Path, dest: &Path) -> Result<()> {
fs::copy(src, dest)
.chain_err(|| ErrorKind::CopyingFile {
src: PathBuf::from(src),
dest: PathBuf::from(dest),
})
.map(|_| ())
let metadata = fs::symlink_metadata(src).chain_err(|| ErrorKind::ReadingFile {
name: "metadata for",
path: PathBuf::from(src),
})?;
if metadata.file_type().is_symlink() {
let link = fs::read_link(src).chain_err(|| ErrorKind::ReadingFile {
name: "link contents for",
path: PathBuf::from(src),
})?;
symlink_file(&link, dest).map(|_| ())
} else {
fs::copy(src, dest)
.chain_err(|| ErrorKind::CopyingFile {
src: PathBuf::from(src),
dest: PathBuf::from(dest),
})
.map(|_| ())
}
}

pub fn remove_dir(
Expand Down
⚡