Commit 280d5501 authored by Seblu's avatar Seblu Committed by Pierre Schmitz
Browse files

makechrootpkg: -I to handle multiple packages 



Since commit cb3a6ce1, running makechroot 2 times to insert a package in a build
directory require to find a directory without PKGBUILD

cd /var/empty
makechrootpkg -cu -I virtualbox-host-dkms-*-i686.pkg.tar.xz -r <dir>
makechrootpkg -I virtualbox-host-dkms-*-i686.pkg.tar.xz -r <dir>
cd -
makechrootpkg -n -r <dir>

This patch allow makechrootpkg to handle more than one package to be installed
before the build is run and simplify the previous case in

makechrootpkg -ncu -I virtualbox-host-dkms-*-i686.pkg.tar.xz -I virtualbox-guest-dkms-*-i686.pkg.tar.xz -r <dir>

Signed-off-by: default avatarSébastien Luttringer <seblu@seblu.net>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent dee4d05b

makechrootpkg.in

+12 −8
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ add_to_db=false 
run_namcap=false

chrootdir=

passeddir=

declare -a install_pkgs



default_copy=$USER

[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
@@ -66,7 +67,7 @@ while getopts 'hcudr:I:l:n' arg; do 
		u) update_first=true ;;

		d) add_to_db=true ;;

		r) passeddir="$OPTARG" ;;

		I) install_pkg="$OPTARG" ;;

		I) install_pkgs+=("$OPTARG") ;;

		l) copy="$OPTARG" ;;

		n) run_namcap=true; makepkg_args="$makepkg_args -i" ;;

		*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
@@ -98,7 +99,7 @@ if (( EUID )); then 
	die 'This script must be run as root.'

fi



if [[ ! -f PKGBUILD && -z $install_pkg ]]; then

if [[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]]; then

	die 'This must be run in a directory containing a PKGBUILD.'

fi
@@ -152,14 +153,17 @@ if [[ ! -d $copydir ]] || $clean_first; then 
	exec 8>&-

fi



if [[ -n $install_pkg ]]; then

if [[ -n "${install_pkgs[*]}" ]]; then

	declare -i ret=0

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

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

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



		mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"

	ret=$?

		(( ret += !! $? ))



		rm "$copydir/$pkgname"

	done



	# If there is no PKGBUILD we have done

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