forked from mirrored-repos/manjaro-tools
[util*] msg cosmetics
This commit is contained in:
parent
a6711db657
commit
1d9be059cb
2 changed files with 10 additions and 7 deletions
|
@ -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#*-}
|
||||
|
|
12
lib/util.sh
12
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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue