chore(license): avoid sourcing PKGBUILD in check subcommand

We don't actually need any data from the package, except the pkgbase
which is exclusively used during logging. Simply grep the pkgbase name
and use the path during early code path issues.

Component: pkgctl license check

contrib/completion/bash/devtools.in

@@ -150,7 +150,6 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
-	license
 	release
 	repo
 	search

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file" >/dev/null; then
+		if ! git ls-files --error-unmatch "$file"; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/lib/license/check.sh

@@ -94,19 +94,19 @@ pkgctl_license_check() {
 		pushd "${path}" >/dev/null
 
 		if [[ ! -f PKGBUILD ]]; then
-			msg_error "${BOLD}${pkgbase}:${ALL_OFF} no PKGBUILD found"
+			msg_error "${BOLD}${path}:${ALL_OFF} no PKGBUILD found"
 			return 1
 		fi
 
-		# reset common PKGBUILD variables
+		if [[ ! -f .SRCINFO ]]; then
-		unset pkgbase
+			msg_error "${BOLD}${path}:${ALL_OFF} no .SRCINFO found"
-
+			return 1
-		# shellcheck source=contrib/makepkg/PKGBUILD.proto
+		fi
-		if ! . ./PKGBUILD; then
+
-			msg_error "${BOLD}${pkgbase}:${ALL_OFF} failed to source PKGBUILD"
+		if ! pkgbase=$(grep --max-count=1 --extended-regexp "pkgbase = (.+)" .SRCINFO | awk '{print $3}'); then
+			msg_error "${BOLD}${path}:${ALL_OFF} pkgbase not found in .SRCINFO"
 			return 1
 		fi
-		pkgbase=${pkgbase:-$pkgname}
 
 		if [[ ! -e LICENSE ]]; then
 			msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"

src/lib/license/setup.sh

@@ -191,9 +191,7 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
-    "*sysusers.conf",
     "*.tmpfiles",
-    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/makechrootpkg.in

@@ -150,9 +150,7 @@ install_packages() {
 	pkgnames=("${install_pkgs[@]##*/}")
 
 	cp -- "${install_pkgs[@]}" "$copydir/root/"
-	arch-nspawn "$copydir" \
+	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
-		--machine="$(display_name installing "${pkgnames[@]}")" \
-		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}"
 	ret=$?
 	rm -- "${pkgnames[@]/#/$copydir/root/}"
@@ -293,33 +291,6 @@ move_products() {
 		fi
 	done
 }
-
-# Usage: display_name verb pkgname [pkgname...]
-display_name() {
-	local max_hostname max_pkgnames_length max_pid_digits pkgnames tool verb
-
-	max_hostname=64  # see gethostname(2)
-	num_joiner_chars=3  # see template string below
-	max_pid_digits=7  # ceil(log(2^22, 10))
-
-	tool="${0##*/}"
-	verb="${1?}"
-	shift
-	max_pkgnames_length=$((
-		max_hostname - num_joiner_chars - max_pid_digits - "${#tool}" - "${#verb}"
-	))
-	# Normalize the package name so it doubles as a valid hostname
-	# https://github.com/systemd/systemd/blob/v256/src/basic/hostname-util.c#L83-L136
-	pkgnames="$(
-		tr -s -c 'a-z0-9 ' - <<< "$*" | tr ' ' . | head -c ${max_pkgnames_length}
-	)"
-
-	if [[ $# -eq 0 ]]; then
-		printf '%s.%s.%s' "${tool}" "${verb}" $$
-	else
-		printf '%s.%s.%s.%s' "${tool}" "${verb}" "${pkgnames%%-}" $$
-	fi
-}
 # }}}
 
 while getopts 'hcur:I:l:nCTD:d:U:x:t:' arg; do
@@ -397,7 +368,6 @@ if [[ ! -d $copydir ]] || (( clean_first )); then
 fi
 
 (( update_first )) && arch-nspawn "$copydir" \
-		--machine="$(display_name updating)" \
 		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \
 		pacman -Syuu --noconfirm
 
@@ -426,19 +396,11 @@ nspawn_build_args=(
 	"${bindmounts_tmpfs[@]}"
 )
 
-{
-	read -r -d $'\n' pkgbase
-	mapfile -t pkgnames
-} < <(sudo -u "$makepkg_user" bash -c '
-		source PKGBUILD
-		printf "%s\n" "${pkgbase:-${pkgname}}" "${pkgname[@]}"
-')
-
 if arch-nspawn "$copydir" \
 	"${nspawn_build_args[@]}" \
-	--machine="$(display_name building "${pkgbase}")" \
 	/chrootbuild "${makepkg_args[@]}"
 then
+	mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
 	move_products
 else
 	(( ret += 1 ))
@@ -451,11 +413,8 @@ if [[ $inspect == always ]] || ( [[ $inspect == failure ]] && (( ret != 0 )) );
 	else
 		error "Build failed, inspecting %s" "$copydir"
 	fi
-	# Use a short machine name without dots so the shell picks it up
-	# as part of the window title
 	arch-nspawn "$copydir" \
 		"${nspawn_build_args[@]}" \
-		--machine="inspecting-$$" \
 		--user=builduser \
 		--chdir=/build
 fi
@@ -485,9 +444,7 @@ else
 		for remotepkg in "${remotepkgs[@]}"; do
 			if [[ $remotepkg != file://* ]]; then
 				msg2 "Downloading current versions"
-				arch-nspawn "$copydir" \
+				arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
-					--machine="$(display_name downloading "${pkgnames[@]}")" \
-					pacman --noconfirm -Swdd "${pkgnames[@]}"
 				mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
 					--dbpath "$copydir"/var/lib/pacman \
 					-Sddp "${pkgnames[@]}")