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

Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

Browse source
This commit is contained in:
udeved 2017-05-30 23:41:55 +02:00
commit a9625a7193
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/chroot-run.in
View file

@ -95,14 +95,17 @@ copy_hostconf () {
done
if [[ -n ${build_mirror} ]];then
build_mirror=${build_mirror}'/$repo/$arch'
local branch=$(pacman-mirrors -a --prefix "$1" -G)
if ${keep_mirrors}; then
set_branch "$1" "$(get_branch $1)"
# set_branch "$1" "$(get_branch $1)"
pacman-mirrors -a -p "$1" -S "${branch}" -R
else
echo "Server = ${build_mirror}" > "$1/etc/pacman.d/mirrorlist"
local mirror=${build_mirror}'/$repo/$arch'
echo "Server = ${mirror}" > "$1/etc/pacman.d/mirrorlist"
fi
else
set_branch "$1" "$(get_branch $1)"
# set_branch "$1" "$(get_branch $1)"
pacman-mirrors -a -p "$1" -S "$branch" -R
fi
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$1/etc/pacman.conf"

22
lib/util.sh
View file

@ -139,17 +139,17 @@ prepare_dir(){
[[ ! -d $1 ]] && mkdir -p $1
}
# $1: chroot
get_branch(){
echo $(cat "$1/etc/pacman-mirrors.conf" | grep '^Branch = ' | sed 's/Branch = \s*//g')
}
# $1: chroot
# $2: branch
set_branch(){
info "Setting mirrorlist branch: %s" "$2"
sed -e "s|/stable|/$2|g" -i "$1/etc/pacman.d/mirrorlist"
}
# # $1: chroot
# get_branch(){
# echo $(cat "$1/etc/pacman-mirrors.conf" | grep '^Branch = ' | sed 's/Branch = \s*//g')
# }
#
# # $1: chroot
# # $2: branch
# set_branch(){
# info "Setting mirrorlist branch: %s" "$2"
# sed -e "s|/stable|/$2|g" -i "$1/etc/pacman.d/mirrorlist"
# }
init_common(){
[[ -z ${target_branch} ]] && target_branch='stable'