Skip to content

install: friendly message install file to directory #7794

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
merged 2 commits into from
Apr 20, 2025
Merged

install: friendly message install file to directory #7794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a8300
friently message install file to directory containing directory with …
zhw2101024 Apr 20, 2025
d30e2d7
install: test install file to directory containing directory with sam…
zhw2101024 Apr 20, 2025
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
10 changes: 10 additions & 0 deletions src/uu/install/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ enum InstallError {

#[error("failed to access {}: Not a directory", .0.quote())]
NotADirectory(PathBuf),

#[error("cannot overwrite directory {} with non-directory {}", .0.quote(), .1.quote())]
OverrideDirectoryFailed(PathBuf, PathBuf),
}

impl UError for InstallError {
Expand Down Expand Up @@ -748,6 +751,13 @@ fn copy_normal_file(from: &Path, to: &Path) -> UResult<()> {
/// Returns an empty Result or an error in case of failure.
///
fn copy_file(from: &Path, to: &Path) -> UResult<()> {
if to.is_dir() && !from.is_dir() {
return Err(InstallError::OverrideDirectoryFailed(
to.to_path_buf().clone(),
from.to_path_buf().clone(),
)
.into());
}
// fs::copy fails if destination is a invalid symlink.
// so lets just remove all existing files at destination before copy.
if let Err(e) = fs::remove_file(to) {
Expand Down
14 changes: 14 additions & 0 deletions tests/by-util/test_install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,3 +1764,17 @@ fn test_install_from_stdin() {
assert!(at.file_exists(target));
assert_eq!(at.read(target), test_string);
}

#[test]
fn test_install_failing_copy_file_to_target_contain_subdir_with_same_name() {
let (at, mut ucmd) = at_and_ucmd!();
let file = "file";
let dir1 = "dir1";

at.touch(file);
at.mkdir_all(&format!("{dir1}/{file}"));
ucmd.arg(file)
.arg(dir1)
.fails()
.stderr_contains("cannot overwrite directory");
}
Loading