From e0dcd0579fd44ff11cce8e1c30c901774d635253 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 25 Sep 2020 17:46:23 -0700 Subject: [PATCH] dev/core#1393 - distmaker - Skip new file "vendor/bin/pscss" This file was recently added by way of `scssphp`. We don't use it, and trying to bundle the symlink into the tarball breaks some consumers. * Before (last release): `vendor/bin/pscss` does not exist * Before (current master): `vendor/bin/pscss` is created as symlink, copied to tarball * After (this commit): `vendor/bin/pscss` is created on dev-builds but omitted from tarball --- distmaker/dists/common.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh index 90fbeb5d6c..dea909f5a2 100644 --- a/distmaker/dists/common.sh +++ b/distmaker/dists/common.sh @@ -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 } @@ -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 -- 2.25.1