[pacman-dev] [PATCH 6/7] makepkg: output the name of the package being created

[Allan McRae]

Although it should be currently quite obvious what package is being
created when "Creating package..." is printed, it will not be in the
future when a debug package is potentially created too.  Also, given
$pkgname is always correctly set when split packaging now, we no
longer need to pass that around.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/makepkg.sh.in | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index df1823d..e247cad 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1716,7 +1716,7 @@ write_pkginfo() {
 		echo "# using $(fakeroot -v)"
 	fi
 	echo "# $(LC_ALL=C date -u)"
-	printf "pkgname = %s\n" "$1"
+	printf "pkgname = %s\n" "$pkgname"
 	(( SPLITPKG )) && echo pkgbase = $pkgbase
 	echo "pkgver = $(get_full_version)"
 	printf "pkgdesc = %s\n" "$pkgdesc"
@@ -1787,18 +1787,11 @@ create_package() {
 	check_package
 
 	cd_safe "$pkgdir"
-	msg "$(gettext "Creating package...")"
-
-	local nameofpkg
-	if [[ -z $1 ]]; then
-		nameofpkg="$pkgname"
-	else
-		nameofpkg="$1"
-	fi
+	msg "$(gettext "Creating package \"%s\"...")" "$pkgname"
 
 	pkgarch=$(get_pkg_arch)
 
-	write_pkginfo $nameofpkg > .PKGINFO
+	write_pkginfo > .PKGINFO
 
 	local comp_files=('.PKGINFO')
 
@@ -1818,7 +1811,7 @@ create_package() {
 	msg2 "$(gettext "Compressing package...")"
 
 	local fullver=$(get_full_version)
-	local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${pkgarch}${PKGEXT}"
+	local pkg_file="$PKGDEST/${pkgname}-${fullver}-${pkgarch}${PKGEXT}"
 	local ret=0
 
 	[[ -f $pkg_file ]] && rm -f "$pkg_file"
@@ -2327,7 +2320,7 @@ run_split_packaging() {
 		backup_package_variables
 		run_package $pkgname
 		tidy_install
-		create_package $pkgname
+		create_package
 		restore_package_variables
 		pkgdir="${pkgdir%/*}"
 	done
-- 
1.7.12.1