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

stdenv/multiple-outputs: autoremove empty directories

Browse Source 
i.e. remove chains of empty dirs after moving contents out of them.
This commit is contained in:
Vladimír Čunát 2015-10-25 11:23:51 +01:00
parent 5d862db694
commit 689d9757c5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,13 @@ _moveToOutput() {
mkdir -p $(readlink -m "$dstPath/..") # create the parent for $dstPath
mv "$srcPath" "$dstPath"
fi
# remove empty directories, printing iff at least one gets removed
local srcParent="$(readlink -m "$srcPath/..")"
if rmdir "$srcParent"; then
echo "Removing empty $srcParent/ and (possibly) its parents"
rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")"
fi
done
done
}
@ -107,11 +114,6 @@ _multioutDocs() {
# the default outputMan is in $bin
_moveToOutput share/man "${!outputMan}"
_moveToOutput share/man/man3 "${!outputDocdev}"
# Remove empty share directory.
if [ -d "$out/share" ]; then
rmdir "$out/share" --ignore-fail-on-non-empty
fi
}
# Move development-only stuff to the desired outputs.