Improve code quality (#873)

jprichardson · Mar 15, 2021 · 7498c9c · 7498c9c
1 parent 1625838
commit 7498c9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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) {