Skip to content

Commit

Permalink
Merge pull request #18605 from totten/master-pscss
Browse files Browse the repository at this point in the history
dev/core#1393 - distmaker - Skip new file "vendor/bin/pscss"
  • Loading branch information
eileenmcnaughton authored Sep 26, 2020
2 parents b1ef004 + e0dcd05 commit f2ec3ed
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion distmaker/dists/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function dm_remove_files() {
shift

for file in "$@" ; do
[ -f "$tgt/$file" ] && rm -f "$tgt/$file"
[ -f "$tgt/$file" -o -L "$tgt/$file" ] && rm -f "$tgt/$file"
done
}

Expand Down Expand Up @@ -208,6 +208,8 @@ function dm_install_vendor() {

[ ! -d "$to" ] && mkdir "$to"
${DM_RSYNC:-rsync} -avC $excludes_rsync "$repo/./" "$to/./"
## We don't this use CLI script in production, and the symlink breaks D7/BD URL installs
dm_remove_files "$to" "bin/pscss"
}

## usage: dm_install_wordpress <wp_repo_path> <to_path>
Expand Down

0 comments on commit f2ec3ed

Please sign in to comment.