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

[util-iso] clean up set_pacman_conf()

Browse source
This commit is contained in:
udeved 2016-05-21 11:37:34 +02:00 committed by Philip
parent 6a8518dc0f
commit ef2469e764
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/util-iso.sh
View file

@ -520,14 +520,12 @@ load_pkgs(){
set_pacman_conf(){ set_pacman_conf(){
if [[ -f ${USERCONFDIR}/user-repos.conf ]];then if [[ -f ${USERCONFDIR}/user-repos.conf ]];then
local temp=/tmp/custom-pacman.conf local conf=/tmp/custom-pacman.conf
cat ${DATADIR}/pacman-${pacman_conf_arch}.conf > $temp cat ${DATADIR}/pacman-${pacman_conf_arch}.conf > "$conf"
cat ${USERCONFDIR}/user-repos.conf >> $temp cat ${USERCONFDIR}/user-repos.conf >> "$conf"
pacman_conf=$temp pacman_conf="$conf"
is_custom_pac_conf=true
else else
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf" pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
is_custom_pac_conf=false
fi fi
} }