uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(install): 'install file_a file_b' should just copy the file

Browse Source
This commit is contained in:
Sylvestre Ledru
2020-11-29 16:33:46 +01:00
parent 261b4e24d6
commit b07f496b70
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/install/src/install.rs
+3 -1
View File
@@ -390,7 +390,9 @@ fn directory(paths: Vec<String>, b: Behavior) -> i32 {
/// Test if the path is a new file path that can be /// Test if the path is a new file path that can be
/// created immediately /// created immediately
fn is_new_file_path(path: &Path) -> bool { fn is_new_file_path(path: &Path) -> bool {
!path.exists() && path.parent().map(Path::is_dir).unwrap_or(true) !path.exists()
&& (path.parent().map(Path::is_dir).unwrap_or(true)
|| path.parent().unwrap().to_string_lossy().is_empty()) // In case of a simple file
} }
/// Perform an install, given a list of paths and behavior. /// Perform an install, given a list of paths and behavior.
tests/by-util/test_install.rs
+2 -6
View File
@@ -224,7 +224,6 @@ fn test_install_target_new_file_failing_nonexistent_parent() {
assert!(err.contains("not a directory")) assert!(err.contains("not a directory"))
} }
// These two tests are failing but should work // These two tests are failing but should work
#[test] #[test]
fn test_install_copy_file() { fn test_install_copy_file() {
@@ -233,13 +232,10 @@ fn test_install_copy_file() {
let file2 = "test_install_target_dir_file_a2"; let file2 = "test_install_target_dir_file_a2";
at.touch(file1); at.touch(file1);
ucmd.arg(file1).arg(file2).fails();
/* Uncomment when fixed
ucmd.arg(file1).arg(file2).succeeds().no_stderr(); ucmd.arg(file1).arg(file2).succeeds().no_stderr();
assert!(at.file_exists(file1)); assert!(at.file_exists(file1));
assert!(at.file_exists(file2));*/ assert!(at.file_exists(file2));
} }
#[test] #[test]
@@ -259,4 +255,4 @@ fn test_install_target_file_dev_null() {
assert!(at.file_exists(file1)); assert!(at.file_exists(file1));
assert!(at.file_exists(file2)); assert!(at.file_exists(file2));
*/ */
} }