bacman: allow for multiple packages as arguments

To enable the creation of multiple packages with one command move the
assembly process into its own function.

Signed-off-by: Gordian Edenhofer <gordian.edenhofer@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

contrib/bacman.sh.in

@@ -66,7 +66,8 @@ done
 
 m4_include(../scripts/library/term_colors.sh)
 
-if (( $# != 1 )); then
+# Break if no argument was given
+if (( $# < 1 )); then
 	usage
 	exit 1
 fi
@@ -118,10 +119,6 @@ fi
 pkg_dest="${PKGDEST:-$PWD}"
 pkg_pkger=${PACKAGER:-'Unknown Packager'}
 
-pkg_name="$1"
-pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-]))
-pkg_namver=("${pkg_dir[@]##*/}")
-
 #
 # Checks everything is in place
 #
@@ -130,32 +127,33 @@ if [[ ! -d $pac_db ]]; then
 	exit 1
 fi
 
-if (( ${#pkg_dir[@]} != 1 )); then
+# Assemble a single package: $1 = pkgname
+fakebuild() {
+	pkg_name="$1"
+	pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-]))
+	pkg_namver=("${pkg_dir[@]##*/}")
+
+	# Checks database for specified package
+	if (( ${#pkg_dir[@]} != 1 )); then
 		error "%d entries for package %s found in pacman database" \
 			${#pkg_dir[@]} "${pkg_name}"
 		msg2 "%s" "${pkg_dir[@]}"
 		exit 1
-fi
+	fi
-
+	if [[ ! -d $pkg_dir ]]; then
-if [[ ! -d $pkg_dir ]]; then
 		error "package %s is found in pacman database," "${pkg_name}"
 		plain "       but '%s' is not a directory" "${pkg_dir}"
 		exit 1
-fi
+	fi
 
-#
+	# Create working directory
-# Begin
+	msg "Package: ${pkg_namver}"
-#
+	work_dir=$(mktemp -d "${work_dir_root}.XXXXXXXXXX")
-msg "Package: ${pkg_namver}"
+	cd "$work_dir" || exit 1
-work_dir=$(mktemp -d "${TMPDIR:-/tmp}/bacman.XXXXXXXXXX")
-cd "$work_dir" || exit 1
 
-#
+	# Assemble list of files which belong to the package and tar them
-# File copying
+	msg2 "Copying package files..."
-#
+	while read i; do
-msg2 "Copying package files..."
-
-while read i; do
 		if [[ -z $i ]]; then
 			continue
 		fi
@@ -204,9 +202,9 @@ while read i; do
 				;;
 		esac
 
+		# Tar files
 		ret=0
 		bsdtar -cnf - -s'/.pacnew$//' "$local_file" 2> /dev/null | bsdtar -xpf - 2> /dev/null
-
 		# Workaround to bsdtar not reporting a missing file as an error
 		if ! [[ -e $package_file || -L $package_file ]]; then
 			error "unable to add $local_file to the package"
@@ -215,33 +213,30 @@ while read i; do
 			rm -rf "$work_dir"
 			exit 1
 		fi
-done < "$pkg_dir"/files
+	done < "$pkg_dir"/files
 
-ret=$?
+	ret=$?
-if (( ret )); then
+	if (( ret )); then
 		rm -rf "$work_dir"
 		exit 1
-fi
+	fi
 
-pkg_size=$(du -sk | awk '{print $1 * 1024}')
+	# Calculate package size
+	pkg_size=$(du -sk | awk '{print $1 * 1024}')
 
-#
+	# Reconstruct .PKGINFO from database
-# .PKGINFO stuff
+	# TODO adopt makepkg's write_pkginfo() into this or scripts/library
-# TODO adopt makepkg's write_pkginfo() into this or scripts/library
+	msg2 "Generating .PKGINFO metadata..."
-#
+	echo "# Generated by $myname $myver"    > .PKGINFO
-msg2 "Generating .PKGINFO metadata..."
+	if [[ $INFAKEROOT == "1" ]]; then
-echo "# Generated by $myname $myver"    > .PKGINFO
-if [[ $INFAKEROOT == "1" ]]; then
 		echo "# Using $(fakeroot -v)"    >> .PKGINFO
-fi
+	fi
-echo "# $(LC_ALL=C date)"            >> .PKGINFO
+	echo "# $(LC_ALL=C date)"    >> .PKGINFO
-echo "#"                    >> .PKGINFO
+	echo "#"    >> .PKGINFO
-
+	while read i; do
-while read i; do
 		if [[ -z $i ]]; then
 			continue;
 		fi
-
 		if [[ $i == %+([A-Z])% ]]; then
 			current=$i
 			continue
@@ -295,44 +290,39 @@ while read i; do
 			%PROVIDES%)
 				echo "provides = $i"  >> .PKGINFO
 				;;
-
-		# files
 			%BACKUP%)
 				# Strip the md5sum after the tab
 				echo "backup = ${i%%$'\t'*}"   >> .PKGINFO
 				;;
 		esac
-done < <(cat "$pkg_dir"/{desc,files})
+	done < <(cat "$pkg_dir"/{desc,files})
 
-comp_files=".PKGINFO"
+	comp_files=".PKGINFO"
 
-if [[ -f $pkg_dir/install ]]; then
+	# Add instal file if present
+	if [[ -f $pkg_dir/install ]]; then
 		cp "$pkg_dir/install" "$work_dir/.INSTALL"
 		comp_files+=" .INSTALL"
-fi
+	fi
-if [[ -f $pkg_dir/changelog ]]; then
+	if [[ -f $pkg_dir/changelog ]]; then
 		cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
 		comp_files+=" .CHANGELOG"
-fi
+	fi
 
-#
+	# Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL
-# Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL
+	chown root:root "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
-#
+	chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
-chown root:root "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
-chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
 
-#
+	# Generate the package
-# Generate the package
+	msg2 "Generating the package..."
-#
-msg2 "Generating the package..."
 
-pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
+	pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
-ret=0
+	ret=0
 
-# TODO: Maybe this can be set globally for robustness
+	# TODO: Maybe this can be set globally for robustness
-shopt -s -o pipefail
+	shopt -s -o pipefail
-bsdtar -cf - $comp_files * |
+	bsdtar -cf - $comp_files * |
-case "$PKGEXT" in
+	case "$PKGEXT" in
 		*tar.gz)  gzip -c -f -n ;;
 		*tar.bz2) bzip2 -c -f ;;
 		*tar.xz)  xz -c -z - ;;
@@ -340,17 +330,22 @@ case "$PKGEXT" in
 		*tar)     cat ;;
 		*) warning "'%s' is not a valid archive extension." \
 		"$PKGEXT"; cat ;;
-esac > "${pkg_file}"; ret=$?
+	esac > "${pkg_file}"; ret=$?
 
-if (( ret )); then
+	# Move compressed package to destination
+	if (( ret )); then
 		error "Unable to write package to $pkg_dest"
 		plain "       Maybe the disk is full or you do not have write access"
 		rm -rf "$work_dir"
 		exit 1
-fi
+	fi
 
-rm -rf "$work_dir"
+	# Clean up working directory
+	rm -rf "$work_dir"
+}
 
+
+for PKG in $@; do fakebuild $PKG; done
 msg "Done."
 
 exit 0