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

Ops... forgot to change this back after testing...

Browse source
This commit is contained in:
Ramon Buldó 2015-06-03 13:02:40 +02:00
parent 780a0c090e
commit 834703eafc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/mkchroot.in
View file

@ -90,10 +90,10 @@ if [[ -n $pac_conf ]] && [[ -n $mirrors_conf ]]; then
pac_base="$working_dir/pacman-pacstrap.conf" pac_base="$working_dir/pacman-pacstrap.conf"
sed "s#Include = /etc/pacman.d/mirrorlist#Server = ${host_mirror}#g" $pac_conf > $pac_base sed "s#Include = /etc/pacman.d/mirrorlist#Server = ${host_mirror}#g" $pac_conf > $pac_base
basestrap -GMcd ${pac_base:+-C "$pac_base"} "$working_dir" \ basestrap -GMcd ${pac_base:+-C "$pac_base"} "$working_dir" \
"${cache_dirs[@]/#/--cachedir=}" "firefox" || die 'Failed to install all packages' "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
else else
basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
"${cache_dirs[@]/#/--cachedir=}" "firefox" || die 'Failed to install all packages' "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
fi fi
[[ -f "$working_dir/pacman-pacstrap.conf" ]] && rm "$working_dir/pacman-pacstrap.conf" [[ -f "$working_dir/pacman-pacstrap.conf" ]] && rm "$working_dir/pacman-pacstrap.conf"