From 7498c9c9ebe5e83e535092aedb9aad3e23f601bf Mon Sep 17 00:00:00 2001
From: Anton <dev@atjn.dk>
Date: Mon, 15 Mar 2021 15:43:45 +0100
Subject: [PATCH] Improve code quality (#873)

---
 lib/copy-sync/copy-sync.js | 8 +++++---
 lib/copy/copy.js           | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/copy-sync/copy-sync.js b/lib/copy-sync/copy-sync.js
index 31f06e441..72174de06 100644
--- a/lib/copy-sync/copy-sync.js
+++ b/lib/copy-sync/copy-sync.js
@@ -98,11 +98,13 @@ function setDestTimestamps (src, dest) {
 }
 
 function onDir (srcStat, destStat, src, dest, opts) {
-  if (!destStat) return mkDirAndCopy(srcStat.mode, src, dest, opts)
-  if (destStat && !destStat.isDirectory()) {
+  if (destStat) {
+    if (destStat.isDirectory()) {
+      return copyDir(src, dest, opts)
+    }
     throw new Error(`Cannot overwrite non-directory '${dest}' with directory '${src}'.`)
   }
-  return copyDir(src, dest, opts)
+  return mkDirAndCopy(srcStat.mode, src, dest, opts)
 }
 
 function mkDirAndCopy (srcMode, src, dest, opts) {
diff --git a/lib/copy/copy.js b/lib/copy/copy.js
index 328f1025f..480dfbbe3 100644
--- a/lib/copy/copy.js
+++ b/lib/copy/copy.js
@@ -142,11 +142,13 @@ function setDestTimestamps (src, dest, cb) {
 }
 
 function onDir (srcStat, destStat, src, dest, opts, cb) {
-  if (!destStat) return mkDirAndCopy(srcStat.mode, src, dest, opts, cb)
-  if (destStat && !destStat.isDirectory()) {
+  if (destStat) {
+    if (destStat.isDirectory()) {
+      return copyDir(src, dest, opts, cb)
+    }
     return cb(new Error(`Cannot overwrite non-directory '${dest}' with directory '${src}'.`))
   }
-  return copyDir(src, dest, opts, cb)
+  return mkDirAndCopy(srcStat.mode, src, dest, opts, cb)
 }
 
 function mkDirAndCopy (srcMode, src, dest, opts, cb) {