root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util] add check_profile()

Browse source
This commit is contained in:
udeved 2015-05-22 00:13:39 +02:00 committed by Ramon Buldó
parent cba1d2466d
commit add181303e
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/util-iso.sh
View file

@ -552,36 +552,6 @@ build_images(){
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer}) minutes"
}
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]"
for f in ${keyfiles[@]}; do
if [[ -f $1/$f ]];then
has_keyfiles=true
else
has_keyfiles=false
break
fi
done
for d in ${keydirs[@]}; do
if [[ -d $1/$d ]];then
has_keydirs=true
else
has_keydirs=false
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
eval $2
fi
}
make_profile(){
msg "Start building [$1]"
cd $1

30
lib/util.sh
View file

@ -425,6 +425,36 @@ load_user_info(){
USER_CONFIG="$USER_HOME/.config"
}
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]"
for f in ${keyfiles[@]}; do
if [[ -f $1/$f ]];then
has_keyfiles=true
else
has_keyfiles=false
break
fi
done
for d in ${keydirs[@]}; do
if [[ -d $1/$d ]];then
has_keydirs=true
else
has_keydirs=false
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
eval $2
fi
}
# $1: file
# $2: exit code
check_sanity(){