From 54febf380d908385957a5b1ea2252edc59ab3d1c Mon Sep 17 00:00:00 2001 From: Tobias Dreyer Date: Tue, 16 Aug 2011 12:22:29 +0200 Subject: [PATCH] bee-remove: first check if $basedir is empty, then check if needed by other package --- src/bee-remove.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bee-remove.sh.in b/src/bee-remove.sh.in index 46d4895..8f2db48 100755 --- a/src/bee-remove.sh.in +++ b/src/bee-remove.sh.in @@ -103,9 +103,10 @@ do_remove() { if [ "${BEEMETAFORMAT}" = "2" ] ; then dirs=$(for var in ${!PKG_*} ; do eval echo \${${var}} ; done | sort -ur) for dir in ${dirs} ; do - if [ -d "${dir}" -a -z "$(${BEE_LIBEXECDIR}/bee/bee.d/bee-query ${dir})" ] ; then - ${NOOP:+echo} rmdir ${dir} + if [ ! -d "${dir}" -o -n "$(ls -A ${dir})" -o -n "$(${BEE_LIBEXECDIR}/bee/bee.d/bee-query ${dir})" ] ; then + continue fi + ${NOOP:+echo} rmdir ${dir} done fi }