From 1d9be059cbad79756dbfc93ee94e8c52707070e6 Mon Sep 17 00:00:00 2001 From: udeved Date: Fri, 22 May 2015 14:53:27 +0200 Subject: [PATCH] [util*] msg cosmetics --- lib/util-iso.sh | 5 ++++- lib/util.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 2b8e773..f38df96 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -498,7 +498,10 @@ load_profile(){ for f in ${files[@]};do case $f in Packages|Packages-Livecd|Packages-Xorg|Packages-Lng) continue ;; - *) packages_custom="$f"; msg2 "Packages-Custom: $f" ;; + *) + packages_custom="$f" + #msg2 "Packages-Custom: $f" + ;; esac done custom=${packages_custom#*-} diff --git a/lib/util.sh b/lib/util.sh index 9eba220..d4f7783 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -431,7 +431,7 @@ check_profile(){ local keyfiles=('profile.conf' 'mkinitcpio.conf' 'Packages' 'Packages-Livecd') local keydirs=('overlay' 'overlay-livecd' 'isolinux') local has_keyfiles=false has_keydirs=false - msg "Checking profile [$1]" + #msg "Checking profile [$1]" for f in ${keyfiles[@]}; do if [[ -f $1/$f ]];then has_keyfiles=true @@ -448,11 +448,11 @@ check_profile(){ break fi done - msg2 "has_keyfiles: ${has_keyfiles}" - msg2 "has_keydirs: ${has_keydirs}" - if ${has_keyfiles} && ${has_keydirs};then - msg "Profile sanity check passed." - else + #msg2 "has_keyfiles: ${has_keyfiles}" + #msg2 "has_keydirs: ${has_keydirs}" + if ! ${has_keyfiles} && ! ${has_keydirs};then +# msg "Profile sanity check passed." +# else eval $2 fi }