gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #219182 from Artturin/multipleoutputsshdirnotempty

Browse Source
This commit is contained in:
Artturi
2023-03-10 23:46:23 +02:00
committed by GitHub
parent f29c3dcca0 9c72ea8725
commit 3b7e0ed336
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@@ -139,9 +139,9 @@ moveToOutput() {
# remove empty directories, printing iff at least one gets removed # remove empty directories, printing iff at least one gets removed
local srcParent="$(readlink -m "$srcPath/..")" local srcParent="$(readlink -m "$srcPath/..")"
if rmdir "$srcParent"; then if [ -n "$(find "$srcParent" -maxdepth 0 -type d -empty 2>/dev/null)" ]; then
echo "Removing empty $srcParent/ and (possibly) its parents" echo "Removing empty $srcParent/ and (possibly) its parents"
rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \ rmdir -p --ignore-fail-on-non-empty "$srcParent" \
2> /dev/null || true # doesn't ignore failure for some reason 2> /dev/null || true # doesn't ignore failure for some reason
fi fi
done done