Commit 69a3a0e7 authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig)
Browse files

makechrootpkg: Install packages in one step 

Avoids having to specify them in dependency order.
parent ca819a23

makechrootpkg.in

+8 −11
Original line number Diff line number Diff line
@@ -127,19 +127,16 @@ clean_temporary() { 
}



install_packages() {

	local pkgname

	local -a pkgnames

	local ret



	for install_pkg in "${install_pkgs[@]}"; do

		pkgname="${install_pkg##*/}"

		cp "$install_pkg" "$copydir/$pkgname"

	pkgnames=("${install_pkgs[@]##*/}")



		arch-nspawn "$copydir" \

			"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \

			pacman -U /$pkgname --noconfirm

		(( ret += !! $? ))



		rm "$copydir/$pkgname"

	done

	cp -- "${install_pkgs[@]}" "$copydir/root/"

	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \

		pacman -U --noconfirm -- "${pkgnames[@]/#//root/}"

	ret=$?

	rm -- "${pkgnames[@]/#/$copydir/root/}"



	# If there is no PKGBUILD we are done

	[[ -f PKGBUILD ]] || exit $ret