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

util-iso-chroot: clean up copy_from_cache()

Browse source
This commit is contained in:
udeved 2017-05-10 14:49:36 +02:00
parent e1b82cec3a
commit 22a3c4221b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util-iso-chroot.sh
View file

@ -248,12 +248,12 @@ clean_up_image(){
} }
copy_from_cache(){ copy_from_cache(){
local list="${tmp_dir}"/mhwd-cache.list mnt="$1" pkgs=$2 local list="${tmp_dir}"/mhwd-cache.list mirror="${build_mirror}/${target_branch}"
local mirror="${build_mirror}/${target_branch}" local mnt="$1"; shift
chroot-run -B "$mirror" "$mnt" \ chroot-run -B "$mirror" "$mnt" \
pacman -v -Syw ${pkgs[@]} --noconfirm || return 1 pacman -v -Syw --noconfirm "$@" || return 1
chroot-run -B "$mirror" "$mnt" \ chroot-run -B "$mirror" "$mnt" \
pacman -v -Sp ${pkgs[@]} --noconfirm > "$list" pacman -v -Sp --noconfirm "$@" > "$list"
sed -ni '/.pkg.tar.xz/p' "$list" sed -ni '/.pkg.tar.xz/p' "$list"
sed -i "s/.*\///" "$list" sed -i "s/.*\///" "$list"