Skip to content

Commit

Permalink
Merge pull request #189 from wonknu/bug_copy_asset_symlink
Browse files Browse the repository at this point in the history
fix:if 'site' is a symlink dir-compare break because it does fs.statSync
  • Loading branch information
gregorybesson committed Mar 31, 2017
2 parents 733ccb8 + 37f08bb commit 0cd3954
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/cli/cms/templates/assets.js
Expand Up @@ -2,6 +2,7 @@ import fse from 'fs-extra'
import dircompare from 'dir-compare'
import mkdirp from 'mkdirp'
import path from 'path'
import execPromise from 'child-process-promise'

import {
coreUtils,
Expand All @@ -15,14 +16,16 @@ export function copy() {
var dest = path.join(config.root, publish)
try {
var directory = fse.lstatSync(dest)
if (!directory.isDirectory()) {
if (!directory.isDirectory() && !directory.isSymbolicLink()) {
mkdirp.sync(dest)
}
} catch (e) {
mkdirp.sync(dest)
}

Array.prototype.forEach.call(publicFolders, (publicFolder) => {
var directory = fse.lstatSync(dest)
if(directory.isSymbolicLink()) dest = fse.readlinkSync(dest)
var res = dircompare.compareSync(publicFolder, dest, {compareDate: true})

res.diffSet.forEach(function (entry) {
Expand Down

0 comments on commit 0cd3954

Please sign in to comment.