From 0f7423dfa6e44c11593f1acaca98c372b1dbe50f Mon Sep 17 00:00:00 2001
From: Neculai Balaban <neculai.balaban@outlook.com>
Date: Sat, 20 Mar 2021 14:37:37 +0200
Subject: [PATCH] install: fix bug #1823

---
 src/uu/install/src/install.rs | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs
index 9d1acdc7e..a675549d1 100644
--- a/src/uu/install/src/install.rs
+++ b/src/uu/install/src/install.rs
@@ -426,18 +426,25 @@ fn copy_files_into_dir(files: &[PathBuf], target_dir: &PathBuf, b: &Behavior) ->
 
     let mut all_successful = true;
     for sourcepath in files.iter() {
-        let targetpath = match sourcepath.as_os_str().to_str() {
-            Some(name) => target_dir.join(name),
-            None => {
-                show_error!(
-                    "cannot stat '{}': No such file or directory",
-                    sourcepath.display()
-                );
+        if !sourcepath.exists() {
+            show_error!(
+                "cannot stat '{}': No such file or directory",
+                sourcepath.display()
+            );
 
-                all_successful = false;
-                continue;
-            }
-        };
+            all_successful = false;
+            continue;
+        }
+
+        if sourcepath.is_dir() {
+            show_info!("omitting directory '{}'", sourcepath.display());
+            all_successful = false;
+            continue;
+        }
+
+        let mut targetpath = target_dir.clone().to_path_buf();
+        let filename = sourcepath.components().last().unwrap();
+        targetpath.push(filename);
 
         if copy(sourcepath, &targetpath, b).is_err() {
             all_successful = false;