Correcting --clean handling in lb_config.

This commit is contained in:
Daniel Baumann 2010-09-07 16:25:58 +02:00
parent c47ce2ee03
commit 88e6a4c433
1 changed files with 26 additions and 22 deletions

View File

@ -204,28 +204,8 @@ Local_arguments ()
;;
--clean)
# Remove empty directories in config tree
if ls config/*/ > /dev/null 2>&1
then
rmdir --ignore-fail-on-non-empty config/*/
fi
if [ -d config ]
then
rmdir --ignore-fail-on-non-empty config
fi
if [ -d auto/functions ]
then
rmdir --ignore-fail-on-non-empty auto/functions
fi
if [ -d auto ]
then
rmdir --ignore-fail-on-non-empty auto
fi
exit 0
_CLEAN="true"
shift
;;
# config/common
@ -1355,5 +1335,29 @@ fi
# Checking defaults again
Check_defaults
if [ "${_CLEAN}" = "true" ]
then
# Remove empty directories in config tree
if ls config/*/ > /dev/null 2>&1
then
rmdir --ignore-fail-on-non-empty config/*/
fi
if [ -d config ]
then
rmdir --ignore-fail-on-non-empty config
fi
if [ -d auto/functions ]
then
rmdir --ignore-fail-on-non-empty auto/functions
fi
if [ -d auto ]
then
rmdir --ignore-fail-on-non-empty auto
fi
fi
# Creating stage file
Create_stagefile .stage/config