diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-07-01 07:29:16 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-07-01 07:31:18 +0000 |
| commit | 5f5e894233f2ddcc286213be509bb2115c638a69 (patch) | |
| tree | aa9acc59c7be469622c20c8604bb0bd27b5acc94 /lib/container/remove | |
| parent | Adding upstream version 20170629. (diff) | |
| download | open-infrastructure-compute-tools-5f5e894233f2ddcc286213be509bb2115c638a69.tar.xz open-infrastructure-compute-tools-5f5e894233f2ddcc286213be509bb2115c638a69.zip | |
Adding upstream version 20170701.upstream/20170701
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/remove')
| -rwxr-xr-x | lib/container/remove | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/lib/container/remove b/lib/container/remove index 1b1ba7d..c9a45a6 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -76,6 +76,27 @@ Usage () exit 1 } +Rmdir () +{ + DIRECTORIES="${@}" + + for DIRECTORY in ${DIRECTORIES} + do + PARENT_DIRECTORY="/$(echo ${DIRECTORY} | cut -d / -f 2)" + + if [ "${PARENT_DIRECTORY}" != "${DIRECTORY}" ] + then + # the directory is at least two levels down from / + cd "${PARENT_DIRECTORY}" + + CRUFT="$(echo ${DIRECTORY} | cut -d / -f 3-)" + rmdir --ignore-fail-on-non-empty --parents "${CRUFT}" > /dev/null 2>&1 || true + + cd "${OLDPWD}" + fi + done +} + Parameters "${@}" if [ -z "${NAME}" ] @@ -152,7 +173,7 @@ then do DIRECTORY="$(echo ${BIND} | awk -F: '{ print $1 }')" - rmdir --ignore-fail-on-non-empty --parents ${DIRECTORY} > /dev/null 2>&1 || true + Rmdir "${DIRECTORY}" done fi @@ -167,7 +188,7 @@ then do DIRECTORY="$(echo ${BIND_RO} | awk -F: '{ print $1 }')" - rmdir --ignore-fail-on-non-empty --parents ${DIRECTORY} > /dev/null 2>&1 || true + Rmdir "${DIRECTORY}" done fi fi |