forked from mirrored-repos/manjaro-tools
small fixes
This commit is contained in:
parent
a8d435a9d5
commit
db27542cf6
6 changed files with 30 additions and 38 deletions
|
@ -22,7 +22,7 @@ import ${LIBDIR}/util.sh
|
||||||
|
|
||||||
show_profile(){
|
show_profile(){
|
||||||
eval_edition "$1"
|
eval_edition "$1"
|
||||||
cd ${edition_type}/$1
|
cd ${run_dir}/${edition_type}/$1
|
||||||
load_profile "$1"
|
load_profile "$1"
|
||||||
msg2 "edition_type: ${edition_type}"
|
msg2 "edition_type: ${edition_type}"
|
||||||
if ${verbose};then
|
if ${verbose};then
|
||||||
|
@ -61,7 +61,7 @@ show_profile(){
|
||||||
msg2 "disable_openrc: ${disable_openrc[*]}"
|
msg2 "disable_openrc: ${disable_openrc[*]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
cd ../..
|
cd ${run_dir}
|
||||||
}
|
}
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
|
@ -107,8 +107,9 @@ load_user_info
|
||||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||||
|
|
||||||
clean_first=true
|
run_dir=$(pwd)
|
||||||
|
|
||||||
|
clean_first=true
|
||||||
pretend=false
|
pretend=false
|
||||||
images_only=false
|
images_only=false
|
||||||
iso_only=false
|
iso_only=false
|
||||||
|
@ -169,7 +170,7 @@ mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
|
||||||
|
|
||||||
check_root "$0" "${orig_argv[@]}"
|
check_root "$0" "${orig_argv[@]}"
|
||||||
|
|
||||||
eval_buildset "${buildset_iso}" "${sets_dir_iso}"
|
eval_buildset "${sets_dir_iso}" "${buildset_iso}"
|
||||||
|
|
||||||
import ${LIBDIR}/util-iso.sh
|
import ${LIBDIR}/util-iso.sh
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ display_settings(){
|
||||||
|
|
||||||
msg "PATHS:"
|
msg "PATHS:"
|
||||||
msg2 "work_dir: ${work_dir}"
|
msg2 "work_dir: ${work_dir}"
|
||||||
msg2 "cache_dir_pkg: ${cache_dir_pkg}"
|
msg2 "pkg_dir: ${pkg_dir}"
|
||||||
msg2 "build_mirror: ${build_mirror}/${branch}"
|
msg2 "build_mirror: ${build_mirror}/${branch}"
|
||||||
|
|
||||||
if ${clean_first};then
|
if ${clean_first};then
|
||||||
|
@ -131,13 +131,13 @@ done
|
||||||
if [[ "${arch}" == 'multilib' ]]; then
|
if [[ "${arch}" == 'multilib' ]]; then
|
||||||
pacman_conf_arch=${arch}
|
pacman_conf_arch=${arch}
|
||||||
work_dir=${chroots_pkg}/${branch}/${arch}
|
work_dir=${chroots_pkg}/${branch}/${arch}
|
||||||
cache_dir_pkg=${cache_dir_pkg}/${branch}/${arch}
|
pkg_dir=${cache_dir_pkg}/${branch}/${arch}
|
||||||
arch='x86_64'
|
arch='x86_64'
|
||||||
is_multilib=true
|
is_multilib=true
|
||||||
else
|
else
|
||||||
pacman_conf_arch='default'
|
pacman_conf_arch='default'
|
||||||
work_dir=${chroots_pkg}/${branch}/${arch}
|
work_dir=${chroots_pkg}/${branch}/${arch}
|
||||||
cache_dir_pkg=${cache_dir_pkg}/${branch}/${arch}
|
pkg_dir=${cache_dir_pkg}/${branch}/${arch}
|
||||||
is_multilib=false
|
is_multilib=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -153,9 +153,9 @@ check_root "$0" "${orig_argv[@]}"
|
||||||
|
|
||||||
timer_start=$(get_timer)
|
timer_start=$(get_timer)
|
||||||
|
|
||||||
prepare_dir "${cache_dir_pkg}"
|
prepare_dir "${pkg_dir}"
|
||||||
|
|
||||||
eval_buildset "${buildset_pkg}" "${sets_dir_pkg}"
|
eval_buildset "${sets_dir_pkg}" "${buildset_pkg}"
|
||||||
|
|
||||||
check_requirements
|
check_requirements
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,7 @@ shift $(($OPTIND - 1))
|
||||||
|
|
||||||
timer_start=$(get_timer)
|
timer_start=$(get_timer)
|
||||||
|
|
||||||
eval_buildset "${buildset_iso}" "${sets_dir_iso}"
|
eval_buildset "${sets_dir_iso}" "${buildset_iso}"
|
||||||
|
|
||||||
rsync_args+=(--bwlimit=${limit})
|
rsync_args+=(--bwlimit=${limit})
|
||||||
|
|
||||||
|
|
|
@ -567,9 +567,6 @@ check_profile_conf(){
|
||||||
if ! is_valid_init "${initsys}";then
|
if ! is_valid_init "${initsys}";then
|
||||||
die "initsys only accepts openrc/systemd value!"
|
die "initsys only accepts openrc/systemd value!"
|
||||||
fi
|
fi
|
||||||
if ! is_valid_edition "${edition_type}";then
|
|
||||||
die "edition_type only accepts official/community/community-minimal/sonar/netrunner value!"
|
|
||||||
fi
|
|
||||||
if ! is_valid_bool "${autologin}";then
|
if ! is_valid_bool "${autologin}";then
|
||||||
die "autologin only accepts true/false value!"
|
die "autologin only accepts true/false value!"
|
||||||
fi
|
fi
|
||||||
|
@ -657,7 +654,7 @@ build_images(){
|
||||||
make_profile(){
|
make_profile(){
|
||||||
eval_edition "$1"
|
eval_edition "$1"
|
||||||
msg "Start building [$1]"
|
msg "Start building [$1]"
|
||||||
cd ${edition_type}/$1
|
cd ${run_dir}/${edition_type}/$1
|
||||||
load_profile "$1"
|
load_profile "$1"
|
||||||
import_util_iso_fs
|
import_util_iso_fs
|
||||||
${clean_first} && chroot_clean "${work_dir}"
|
${clean_first} && chroot_clean "${work_dir}"
|
||||||
|
@ -674,7 +671,7 @@ make_profile(){
|
||||||
build_images
|
build_images
|
||||||
compress_images
|
compress_images
|
||||||
fi
|
fi
|
||||||
cd ../..
|
cd ${run_dir}
|
||||||
msg "Finished building [$1]"
|
msg "Finished building [$1]"
|
||||||
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
|
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,8 +96,8 @@ chroot_update(){
|
||||||
|
|
||||||
clean_up(){
|
clean_up(){
|
||||||
msg "Cleaning up ..."
|
msg "Cleaning up ..."
|
||||||
msg2 "Cleaning [${cache_dir_pkg}]"
|
msg2 "Cleaning [${pkg_dir}]"
|
||||||
find ${cache_dir_pkg} -maxdepth 1 -name "*.*" -delete #&> /dev/null
|
find ${pkg_dir} -maxdepth 1 -name "*.*" -delete #&> /dev/null
|
||||||
if [[ -z $SRCDEST ]];then
|
if [[ -z $SRCDEST ]];then
|
||||||
msg2 "Cleaning [source files]"
|
msg2 "Cleaning [source files]"
|
||||||
find $PWD -maxdepth 1 -name '*.?z?' -delete #&> /dev/null
|
find $PWD -maxdepth 1 -name '*.?z?' -delete #&> /dev/null
|
||||||
|
@ -105,7 +105,7 @@ clean_up(){
|
||||||
}
|
}
|
||||||
|
|
||||||
sign_pkg(){
|
sign_pkg(){
|
||||||
su ${OWNER} -c "signpkg ${cache_dir_pkg}/$1"
|
su ${OWNER} -c "signpkg ${pkg_dir}/$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_post_build(){
|
run_post_build(){
|
||||||
|
@ -120,24 +120,24 @@ run_post_build(){
|
||||||
if [[ -n $PKGDEST ]];then
|
if [[ -n $PKGDEST ]];then
|
||||||
if [[ -n ${pkgbase} ]];then
|
if [[ -n ${pkgbase} ]];then
|
||||||
for p in ${pkgname[@]};do
|
for p in ${pkgname[@]};do
|
||||||
mv $PKGDEST/${p}-${pinfo}.${ext} ${cache_dir_pkg}/
|
mv $PKGDEST/${p}-${pinfo}.${ext} ${pkg_dir}/
|
||||||
${sign} && sign_pkg ${p}-${pinfo}.${ext}
|
${sign} && sign_pkg ${p}-${pinfo}.${ext}
|
||||||
loglist+=("*$p*.log")
|
loglist+=("*$p*.log")
|
||||||
lname=${pkgbase}
|
lname=${pkgbase}
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
mv $PKGDEST/${pkgname}-${pinfo}.${ext} ${cache_dir_pkg}/
|
mv $PKGDEST/${pkgname}-${pinfo}.${ext} ${pkg_dir}/
|
||||||
${sign} && sign_pkg ${pkgname}-${pinfo}.${ext}
|
${sign} && sign_pkg ${pkgname}-${pinfo}.${ext}
|
||||||
loglist+=("*${pkgname}*.log")
|
loglist+=("*${pkgname}*.log")
|
||||||
lname=${pkgname}
|
lname=${pkgname}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
mv *.${ext} ${cache_dir_pkg}
|
mv *.${ext} ${pkg_dir}
|
||||||
${sign} && sign_pkg ${pkgname}-${pinfo}.${ext}
|
${sign} && sign_pkg ${pkgname}-${pinfo}.${ext}
|
||||||
loglist+=("*${pkgname}*.log")
|
loglist+=("*${pkgname}*.log")
|
||||||
lname=${pkgname}
|
lname=${pkgname}
|
||||||
fi
|
fi
|
||||||
chown -R "${OWNER}:users" "${cache_dir_pkg}"
|
chown -R "${OWNER}:users" "${pkg_dir}"
|
||||||
if [[ -z $LOGDEST ]];then
|
if [[ -z $LOGDEST ]];then
|
||||||
tar -cjf ${lname}-${pinfo}.log.tar.xz ${loglist[@]}
|
tar -cjf ${lname}-${pinfo}.log.tar.xz ${loglist[@]}
|
||||||
find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null
|
find $PWD -maxdepth 1 -name '*.log' -delete #&> /dev/null
|
||||||
|
|
26
lib/util.sh
26
lib/util.sh
|
@ -13,7 +13,7 @@ read_set(){
|
||||||
_clean=':a;N;$!ba;s/\n/ /g' \
|
_clean=':a;N;$!ba;s/\n/ /g' \
|
||||||
_com_rm="s|#.*||g"
|
_com_rm="s|#.*||g"
|
||||||
|
|
||||||
stack=$(sed "$_com_rm" "$1" \
|
stack=$(sed "$_com_rm" "$1.set" \
|
||||||
| sed "$_space" \
|
| sed "$_space" \
|
||||||
| sed "$_clean")
|
| sed "$_clean")
|
||||||
}
|
}
|
||||||
|
@ -28,21 +28,22 @@ load_sets(){
|
||||||
echo $prof
|
echo $prof
|
||||||
}
|
}
|
||||||
|
|
||||||
# $1: buildset
|
|
||||||
# $2: sets_dir
|
# $1: sets_dir
|
||||||
|
# $2: buildset
|
||||||
eval_buildset(){
|
eval_buildset(){
|
||||||
eval "case $1 in
|
eval "case $2 in
|
||||||
$(load_sets $2)) is_buildset=true ;;
|
$(load_sets $1)) is_buildset=true ;;
|
||||||
*) is_buildset=false ;;
|
*) is_buildset=false ;;
|
||||||
esac"
|
esac"
|
||||||
${is_buildset} && read_set $2/$1.set
|
${is_buildset} && read_set $1/$2
|
||||||
}
|
}
|
||||||
|
|
||||||
eval_edition(){
|
eval_edition(){
|
||||||
local result=$(find . -maxdepth 2 -name "$1") et
|
local result=$(find . -maxdepth 2 -name "$1") path
|
||||||
[[ -z $result ]] && die "$1 is not a valid profile or buildset!"
|
[[ -z $result ]] && die "$1 is not a valid profile or buildset!"
|
||||||
et=${result#./*}
|
path=${result#./*}
|
||||||
edition_type=${et%%/*}
|
edition_type=${path%%/*}
|
||||||
}
|
}
|
||||||
|
|
||||||
get_timer(){
|
get_timer(){
|
||||||
|
@ -399,13 +400,6 @@ is_valid_init(){
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
is_valid_edition(){
|
|
||||||
case $1 in
|
|
||||||
'official'|'community'|'community-minimal'|'sonar'|'netrunner') return 0 ;;
|
|
||||||
*) return 1 ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
is_valid_arch_pkg(){
|
is_valid_arch_pkg(){
|
||||||
case $1 in
|
case $1 in
|
||||||
'i686'|'x86_64'|'multilib') return 0 ;;
|
'i686'|'x86_64'|'multilib') return 0 ;;
|
||||||
|
|
Loading…
Reference in a new issue