From be85cafb162c8f27128039f67e44e557dc300114 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 9 Sep 2016 10:13:18 -0700 Subject: [PATCH] Don't try to unlink folders --- Jakefile.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index e304ce0e34..a5a733f31a 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -1003,15 +1003,18 @@ function acceptBaseline(containerFolder) { var deleteEnding = '.delete'; for (var i in files) { var filename = files[i]; - if (filename.substr(filename.length - deleteEnding.length) === deleteEnding) { - filename = filename.substr(0, filename.length - deleteEnding.length); - fs.unlinkSync(path.join(targetFolder, filename)); - } else { - var target = path.join(targetFolder, filename); - if (fs.existsSync(target)) { - fs.unlinkSync(target); + var fullLocalPath = path.join(sourceFolder, filename); + if (fs.statSync(fullLocalPath).isFile()) { + if (filename.substr(filename.length - deleteEnding.length) === deleteEnding) { + filename = filename.substr(0, filename.length - deleteEnding.length); + fs.unlinkSync(path.join(targetFolder, filename)); + } else { + var target = path.join(targetFolder, filename); + if (fs.existsSync(target)) { + fs.unlinkSync(target); + } + fs.renameSync(path.join(sourceFolder, filename), target); } - fs.renameSync(path.join(sourceFolder, filename), target); } } }