refactor a bit

jprichardson · May 25, 2018 · 456241a · 456241a
1 parent 4b4f3cf
commit 456241a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/lib/copy-sync/copy-sync.js b/lib/copy-sync/copy-sync.js
@@ -164,10 +164,7 @@ function copyLink (resolvedSrc, dest) {
 function isSrcSubdir (src, dest) {
   const srcArray = path.resolve(src).split(path.sep)
   const destArray = path.resolve(dest).split(path.sep)
-
-  return srcArray.reduce((acc, current, i) => {
-    return acc && destArray[i] === current
-  }, true)
+  return srcArray.reduce((acc, current, i) => acc && destArray[i] === current, true)
 }
 
 function checkStats (src, dest) {
@@ -184,10 +181,10 @@ function checkStats (src, dest) {
 
 function checkPaths (src, dest) {
   const {srcStat, destStat} = checkStats(src, dest)
-  if (srcStat && destStat && destStat !== notExist && srcStat.ino === destStat.ino) {
+  if (destStat.ino && destStat.ino === srcStat.ino) {
     throw new Error('Source and destination must not be the same.')
   }
-  if (srcStat && srcStat.isDirectory() && isSrcSubdir(src, dest)) {
+  if (srcStat.isDirectory() && isSrcSubdir(src, dest)) {
     throw new Error(`Cannot copy '${src}' to a subdirectory of itself, '${dest}'.`)
   }
   return destStat

diff --git a/lib/copy/copy.js b/lib/copy/copy.js
@@ -213,10 +213,7 @@ function copyLink (resolvedSrc, dest, cb) {
 function isSrcSubdir (src, dest) {
   const srcArray = path.resolve(src).split(path.sep)
   const destArray = path.resolve(dest).split(path.sep)
-
-  return srcArray.reduce((acc, current, i) => {
-    return acc && destArray[i] === current
-  }, true)
+  return srcArray.reduce((acc, current, i) => acc && destArray[i] === current, true)
 }
 
 function checkStats (src, dest, cb) {
@@ -236,10 +233,10 @@ function checkPaths (src, dest, cb) {
   checkStats(src, dest, (err, stats) => {
     if (err) return cb(err)
     const {srcStat, destStat} = stats
-    if (srcStat && destStat && destStat !== notExist && srcStat.ino === destStat.ino) {
+    if (destStat.ino && destStat.ino === srcStat.ino) {
       return cb(new Error('Source and destination must not be the same.'))
     }
-    if (srcStat && srcStat.isDirectory() && isSrcSubdir(src, dest)) {
+    if (srcStat.isDirectory() && isSrcSubdir(src, dest)) {
       return cb(new Error(`Cannot copy '${src}' to a subdirectory of itself, '${dest}'.`))
     }
     return cb(null, destStat)