Merge remote-tracking branch 'tobi-github/bugfix'

* tobi-github/bugfix: bee-remove: first check if $basedir is empty, then check if needed by other package
mariux64 · Aug 16, 2011 · 1693776 · 1693776
2 parents 8d1fa5f + 54febf3
commit 1693776
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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
 }