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

buildiso: move user-repos.conf to profile_dir #221

Browse source
This commit is contained in:
udeved 2016-05-23 00:16:53 +02:00 committed by Philip
parent ef2469e764
commit cd3938d41d
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -186,8 +186,6 @@ eval_buildset "${sets_dir_iso}" "${buildset_iso}"
import ${LIBDIR}/util-iso.sh
set_pacman_conf
check_requirements
${pretend} && display_settings && exit 1

25
lib/util-iso.sh
View file

@ -518,17 +518,6 @@ load_pkgs(){
fi
}
set_pacman_conf(){
if [[ -f ${USERCONFDIR}/user-repos.conf ]];then
local conf=/tmp/custom-pacman.conf
cat ${DATADIR}/pacman-${pacman_conf_arch}.conf > "$conf"
cat ${USERCONFDIR}/user-repos.conf >> "$conf"
pacman_conf="$conf"
else
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
fi
}
check_profile(){
local keyfiles=("${profile_dir}/mkinitcpio.conf"
"${profile_dir}/Packages-Root"
@ -656,12 +645,26 @@ make_profile(){
show_elapsed_time "${FUNCNAME}" "${timer_start}"
}
set_pacman_conf(){
if [[ -f ${profile_dir}/user-repos.conf ]];then
local conf=/tmp/custom-pacman.conf
cat ${DATADIR}/pacman-${pacman_conf_arch}.conf > "$conf"
cat ${profile_dir}/user-repos.conf >> "$conf"
pacman_conf="$conf"
else
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
fi
}
load_profile(){
conf="${profile_dir}/profile.conf"
info "Profile: [%s]" "${profile}"
load_profile_config "$conf"
set_pacman_conf
iso_file=$(gen_iso_fn).iso
mkchroot_args+=(-C ${pacman_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}" -K)