From 85c4882e084515f8b047bfce076fc897a97950ae Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Sat, 2 May 2015 23:43:11 +0530 Subject: [PATCH] [util-iso] allow configuring xorg and lng pkg cache cleanup via config --- bin/buildiso.in | 2 -- conf/manjaro-tools.conf | 6 ++++++ lib/util.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/bin/buildiso.in b/bin/buildiso.in index 9f20a42..0e11541 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -118,8 +118,6 @@ load_config "${USER_CONFIG}/manjaro-tools.conf" load_config "${SYSCONFDIR}/manjaro-tools.conf" clean_first=true -clean_cache_xorg=true -clean_cache_lng=true clean_cache_iso=true pretend=false diff --git a/conf/manjaro-tools.conf b/conf/manjaro-tools.conf index c20214e..acb1d57 100644 --- a/conf/manjaro-tools.conf +++ b/conf/manjaro-tools.conf @@ -53,6 +53,12 @@ # default iso buildset; name without .set extension # buildset_iso=default +# clean xorg cache before building +# clean_cache_xorg=true + +# clean lng cache before building +# clean_cache_lng=true + # unset defaults to given value # dist_name="Manjaro" diff --git a/lib/util.sh b/lib/util.sh index e7f273d..e8162e3 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -258,6 +258,14 @@ load_config(){ buildset_iso='default' fi + if [[ -z ${clean_cache_xorg} ]];then + clean_cache_xorg='true' + fi + + if [[ -z ${clean_cache_lng} ]];then + clean_cache_lng='true' + fi + ##### iso settings ##### if [[ -z ${dist_release} ]];then