summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-09-30 15:13:42 +0200
committerDaniel Baumann <daniel@debian.org>2012-09-30 15:13:42 +0200
commitefe7090bdb45ffa9ab13d54a2c1e4dafd01f10aa (patch)
tree8627f00aede415926757a4148d8ef0e50f6182c3
parentf735d984cfa35ad2e4afc6576bc294691dfdf25f (diff)
downloadvyos-live-build-efe7090bdb45ffa9ab13d54a2c1e4dafd01f10aa.tar.gz
vyos-live-build-efe7090bdb45ffa9ab13d54a2c1e4dafd01f10aa.zip
Simplyfing clean option in lb config.
-rwxr-xr-xscripts/build/config5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 94a176803..db87bc691 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1492,11 +1492,10 @@ Check_defaults
if [ "${_CLEAN}" = "true" ]
then
# Remove empty directories in config tree
+ rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty config/*/ > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty config > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty auto > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty local/functions > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty local/scripts > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty local/*/ > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true
fi