From a66cba1b08cc7c9f55efcfda6f4ab3cafff6b874 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 21 Mar 2016 11:49:16 +1000 Subject: libmakepkg: ensure emptydir find command acts on individual directories Using "-exec command {} +" systax exits on any error. Such errors occur when running rmdir on a non-empty directory. Switch to "{} ;" syntax instead which avoids exiting before the find command is completed. Fixes FS#48515. Note, we can not use "-empty" in the find command because it is not supported by Busybox find, and the "--ignore-fail-on-non-empty" flag for rmdir is not available on BSD rmdir variants. Signed-off-by: Allan McRae (cherry picked from commit baf1ff64e6ea23e93f307480480d87159cd2e487) --- scripts/libmakepkg/tidy/emptydirs.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/emptydirs.sh.in index 32b8d8ca..85ab39df 100644 --- a/scripts/libmakepkg/tidy/emptydirs.sh.in +++ b/scripts/libmakepkg/tidy/emptydirs.sh.in @@ -33,6 +33,7 @@ tidy_remove+=('tidy_emptydirs') tidy_emptydirs() { if check_option "emptydirs" "n"; then msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -exec rmdir '{}' + 2>/dev/null + # we are unable to use '-empty' as it is non-POSIX and not support by all find variants + find . -depth -type d -exec rmdir '{}' \; 2>/dev/null fi } -- cgit v1.2.3-70-g09d2