forked from mirrored-repos/manjaro-tools
[util*] redo checks
This commit is contained in:
parent
b3a74eb8cf
commit
2271bd2aa7
3 changed files with 52 additions and 61 deletions
|
@ -13,11 +13,44 @@ import ${LIBDIR}/util-iso-image.sh
|
|||
import ${LIBDIR}/util-iso-boot.sh
|
||||
import ${LIBDIR}/util-iso-calamares.sh
|
||||
|
||||
# check_run_dir(){
|
||||
# if [[ ! -f shared/Packages-Systemd ]] || [[ ! -f shared/Packages-Openrc ]];then
|
||||
# die "${0##*/} is not run in a valid iso-profiles folder!"
|
||||
# fi
|
||||
# }
|
||||
# $1: path
|
||||
# $2: exit code
|
||||
check_profile(){
|
||||
local keyfiles=('profile.conf' 'mkinitcpio.conf' 'Packages' 'Packages-Livecd')
|
||||
local keydirs=('overlay' 'overlay-livecd' 'isolinux')
|
||||
local has_keyfiles=false has_keydirs=false
|
||||
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
|
||||
if ! ${has_keyfiles} && ! ${has_keydirs};then
|
||||
die "Profile ($1) sanity check failed!"
|
||||
fi
|
||||
}
|
||||
|
||||
check_requirements(){
|
||||
if ${is_buildset};then
|
||||
for p in $(cat ${sets_dir_iso}/${buildset_iso}.set);do
|
||||
[[ -z $(find . -type d -name "${p}") ]] && die "${buildset_iso} is not a valid buildset!"
|
||||
check_profile "$p"
|
||||
done
|
||||
else
|
||||
[[ -z $(find . -type d -name "${buildset_iso}") ]] && die "${buildset_iso} is not a valid profile directory!"
|
||||
check_profile "${buildset_iso}"
|
||||
fi
|
||||
}
|
||||
|
||||
copy_overlay_root(){
|
||||
msg2 "Copying overlay ..."
|
||||
|
@ -451,11 +484,6 @@ load_pkgs_lng(){
|
|||
packages_lng_kde=$(sed "s|#.*||g" Packages-Lng | grep kde | sed "s|>kde||g" | sed ':a;N;$!ba;s/\n/ /g')
|
||||
}
|
||||
|
||||
check_chroot_version(){
|
||||
[[ -f ${work_dir}/root-image/.manjaro-tools ]] && local chroot_version=$(cat ${work_dir}/root-image/.manjaro-tools)
|
||||
[[ ${version} != $chroot_version ]] && clean_first=true
|
||||
}
|
||||
|
||||
check_plymouth(){
|
||||
is_plymouth=false
|
||||
source mkinitcpio.conf
|
||||
|
@ -496,7 +524,7 @@ load_profile(){
|
|||
|
||||
check_plymouth
|
||||
|
||||
[[ -d ${work_dir}/root-image ]] && check_chroot_version
|
||||
[[ -d ${work_dir}/root-image ]] && check_chroot_version "${work_dir}/root-image"
|
||||
}
|
||||
|
||||
compress_images(){
|
||||
|
@ -562,11 +590,9 @@ make_profile(){
|
|||
build_iso(){
|
||||
if ${is_buildset};then
|
||||
for prof in $(cat ${sets_dir_iso}/${buildset_iso}.set); do
|
||||
# check_profile "$prof" "break"
|
||||
make_profile "$prof"
|
||||
done
|
||||
else
|
||||
# check_profile "${buildset_iso}" 'die "Profile sanity check failed."'
|
||||
make_profile "${buildset_iso}"
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -9,22 +9,21 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
check_chroot_version(){
|
||||
[[ -f ${work_dir}/root/.manjaro-tools ]] && local chroot_version=$(cat ${work_dir}/root/.manjaro-tools)
|
||||
msg "chroot version: $chroot_version"
|
||||
if [[ ${version} != $chroot_version ]];then
|
||||
clean_first=true
|
||||
fi
|
||||
check_build(){
|
||||
[[ ! -f $1/PKGBUILD ]] && die "Directory must contain a PKGBUILD!"
|
||||
}
|
||||
|
||||
check_requirements(){
|
||||
[[ -z $(find . -maxdepth 2 -name 'PKGBUILD' -type f) ]] && die "${0##*/} must be run inside a valid PKGBUILD directory!"
|
||||
# [[ -z $(find . -maxdepth 2 -name 'PKGBUILD' -type f) ]] && die "${0##*/} must be run inside a valid PKGBUILD directory!"
|
||||
if ${is_buildset};then
|
||||
for i in $(cat ${sets_dir_pkg}/${buildset_pkg}.set);do
|
||||
[[ -z $(find . -type d -name "${i}") ]] && die "${buildset_pkg} is not a valid buildset!"
|
||||
for p in $(cat ${sets_dir_pkg}/${buildset_pkg}.set);do
|
||||
[[ -z $(find . -type d -name "${p}") ]] && die "${buildset_pkg} is not a valid buildset!"
|
||||
check_build "$p"
|
||||
done
|
||||
else
|
||||
[[ -z $(find . -type d -name "${buildset_pkg}") ]] && die "${buildset_pkg} is not a valid package!"
|
||||
msg "$PWD/${buildset_pkg}/PKGBUILD"
|
||||
check_build "${buildset_pkg}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -138,11 +137,9 @@ make_pkg(){
|
|||
chroot_build(){
|
||||
if ${is_buildset};then
|
||||
for pkg in $(cat ${sets_dir_pkg}/${buildset_pkg}.set); do
|
||||
#check_sanity "$pkg/PKGBUILD" "break"
|
||||
make_pkg "$pkg" "break"
|
||||
done
|
||||
else
|
||||
#check_sanity "${buildset_pkg}/PKGBUILD" 'die "Not a valid package!"'
|
||||
make_pkg "${buildset_pkg}" "abort"
|
||||
fi
|
||||
}
|
||||
|
|
42
lib/util.sh
42
lib/util.sh
|
@ -489,43 +489,6 @@ load_user_info(){
|
|||
USER_CONFIG="$USER_HOME/.config"
|
||||
}
|
||||
|
||||
# $1: path
|
||||
# $2: exit code
|
||||
check_profile(){
|
||||
local keyfiles=('profile.conf' 'mkinitcpio.conf' 'Packages' 'Packages-Livecd')
|
||||
local keydirs=('overlay' 'overlay-livecd' 'isolinux')
|
||||
local has_keyfiles=false has_keydirs=false
|
||||
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
|
||||
if ! ${has_keyfiles} && ! ${has_keydirs};then
|
||||
# msg "Profile sanity check passed."
|
||||
# else
|
||||
eval $2
|
||||
fi
|
||||
}
|
||||
|
||||
# $1: file
|
||||
# $2: exit code
|
||||
# check_sanity(){
|
||||
# if [[ ! -f $1 ]]; then
|
||||
# eval "$2"
|
||||
# fi
|
||||
# }
|
||||
|
||||
show_version(){
|
||||
msg "manjaro-tools"
|
||||
msg2 "version: ${version}"
|
||||
|
@ -568,3 +531,8 @@ create_min_fs(){
|
|||
mkdir -m 1777 -p $1/tmp
|
||||
mkdir -m 0555 -p $1/{sys,proc}
|
||||
}
|
||||
|
||||
check_chroot_version(){
|
||||
[[ -f $1/.manjaro-tools ]] && local chroot_version=$(cat $1/.manjaro-tools)
|
||||
[[ ${version} != $chroot_version ]] && clean_first=true
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue