Merge branch 'version_upgrade_confirm' into 'master'

feat(version upgrade): Add diff & confirmation for pkgctl version upgrade

Closes #239

See merge request archlinux/devtools!274

contrib/completion/bash/devtools.in

@@ -418,6 +418,7 @@ _pkgctl_version_setup_args__url_opts() { :; }
 
 _pkgctl_version_upgrade_args=(
 	--no-update-checksums
+	--noconfirm
 	-v --verbose
 	-h --help
 )

contrib/completion/zsh/_devtools.in

@@ -456,6 +456,7 @@ _pkgctl_version_setup_args=(
 
 _pkgctl_version_upgrade_args=(
 	'--no-update-checksums[Disable computation and update of the checksums]'
+	'--noconfirm[Do not ask to confirm changes made to the PKGBUILD file]'
 	'(-v --verbose)'{-v,--verbose}'[Display results including up-to-date versions]'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:git_dir:_files -/'

doc/man/pkgctl-version-upgrade.1.asciidoc

@@ -38,6 +38,9 @@ Options
 *--no-update-checksums*::
 	Disable computation and update of the checksums
 
+*--noconfirm*::
+	Do not ask to confirm changes made to the PKGBUILD file
+
 *-v, --verbose*::
 	Display results including up-to-date versions
 

src/lib/build/build.sh

@@ -312,7 +312,7 @@ pkgctl_build() {
 
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache stable
+		update_pacman_repo_cache multilib
 	# Check valid repos if not resolved dynamically
 	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"

src/lib/db/remove.sh

@@ -51,6 +51,7 @@ pkgctl_db_remove() {
 	local partial=0
 	local confirm=1
 	local dbscripts_options=()
+	local lookup_repo=multilib
 	local pkgname
 
 	# option checking
@@ -105,13 +106,13 @@ pkgctl_db_remove() {
 				update_pacman_repo_cache unstable
 				;;
 			*-staging)
-				update_pacman_repo_cache staging
+				update_pacman_repo_cache multilib-staging
 				;;
 			*-testing)
-				update_pacman_repo_cache testing
+				update_pacman_repo_cache multilib-testing
 				;;
 			*)
-				update_pacman_repo_cache stable
+				update_pacman_repo_cache multilib
 				;;
 		esac
 

src/lib/license/setup.sh

@@ -188,7 +188,6 @@ path = [
     "README.md",
     "keys/**",
     ".SRCINFO",
-    ".gitignore",
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",

src/lib/release.sh

@@ -124,7 +124,7 @@ pkgctl_release() {
 
 	# Update pacman cache for auto-detection
 	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache stable
+		update_pacman_repo_cache multilib
 	# Check valid repos if not resolved dynamically
 	elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
 		die "Invalid repository target: %s" "${REPO}"

src/lib/util/machine.sh

@@ -1,26 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_MACHINE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_MACHINE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-
-set -eo pipefail
-
-machine_get_hardware_name() {
-	uname --machine
-}
-
-machine_has_multilib() {
-	case "$(machine_get_hardware_name)" in
-		x86_64*)
-			return 0
-			;;
-	esac
-	return 1
-}

src/lib/util/pacman.sh

@@ -8,8 +8,6 @@ DEVTOOLS_INCLUDE_UTIL_PACMAN_SH=1
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/util/machine.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/machine.sh
 
 set -e
 
@@ -20,8 +18,7 @@ readonly _DEVTOOLS_MAKEPKG_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/makepkg.conf.d
 
 
 update_pacman_repo_cache() {
-	local repo=${1:-stable}
+	local repo=${1:-multilib}
-	repo=$(pacman_resolve_virtual_repo_name "${repo}")
 
 	mkdir -p "${_DEVTOOLS_PACMAN_CACHE_DIR}"
 	msg "Updating pacman database cache"
@@ -35,8 +32,7 @@ update_pacman_repo_cache() {
 
 get_pacman_repo_from_pkgbuild() {
 	local path=${1:-PKGBUILD}
-	local repo=${2:-stable}
+	local repo=${2:-multilib}
-	repo=$(pacman_resolve_virtual_repo_name "${repo}")
 	local -a pkgnames
 
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
@@ -76,7 +72,6 @@ get_pkgnames_from_repo_pkgbase() {
 
 	# update the pacman repo cache if it doesn't exist yet
 	if [[ ! -d "${_DEVTOOLS_PACMAN_CACHE_DIR}" ]]; then
-		# TODO: universe includes multilib, switch for architecture
 		update_pacman_repo_cache universe
 	fi
 
@@ -96,23 +91,3 @@ get_pkgnames_from_repo_pkgbase() {
 	printf "%s\n" "${pkgnames[@]}"
 	return 0
 }
-
-pacman_resolve_virtual_repo_name() {
-	local repo=$1
-
-	local repo_class=extra
-	if machine_has_multilib; then
-		repo_class=multilib
-	fi
-
-	case "${repo}" in
-		stable)
-			repo=${repo_class}
-			;;
-		testing|staging)
-			repo="${repo_class}-${repo}"
-			;;
-	esac
-
-	printf "%s" "${repo}"
-}

src/lib/util/pkgbuild.sh

@@ -21,15 +21,21 @@ pkgbuild_set_pkgver() {
 	local new_pkgver=$1
 	local pkgver=${pkgver}
 
+	if [[ -n $2 ]]; then
+		pkgbuild_file=$2
+	else
+		pkgbuild_file="PKGBUILD"
+	fi
+
 	if [[ $(type -t pkgver) == function ]]; then
 		# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
 		warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
 	fi
 
-	if ! grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" PKGBUILD; then
+	if ! grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" "${pkgbuild_file}"; then
 		die "Non-standard pkgver declaration"
 	fi
-	sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${new_pkgver}|g" --in-place PKGBUILD
+	sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${new_pkgver}|g" --in-place "${pkgbuild_file}"
 }
 
 # set the pkgrel variable in a PKGBUILD
@@ -38,10 +44,16 @@ pkgbuild_set_pkgrel() {
 	local new_pkgrel=$1
 	local pkgrel=${pkgrel}
 
-	if ! grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" PKGBUILD; then
+	if [[ -n $2 ]]; then
+		pkgbuild_file=$2
+	else
+		pkgbuild_file="PKGBUILD"
+	fi
+
+	if ! grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" "${pkgbuild_file}"; then
 		die "Non-standard pkgrel declaration"
 	fi
-	sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${new_pkgrel}|g" --in-place PKGBUILD
+	sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${new_pkgrel}|g" --in-place "${pkgbuild_file}"
 }
 
 pkgbuild_update_checksums() {
@@ -53,6 +65,14 @@ pkgbuild_update_checksums() {
 	builddir=$(mktemp --tmpdir="${WORKDIR}" --directory update-checksums.XXXXXX)
 	newbuildfile="${builddir}/PKGBUILD"
 
+	if [[ -n $2 ]]; then
+		pkgbuild_file=$2
+		cp PKGBUILD "${builddir}/PKGBUILD-tmp" && mv -f "${pkgbuild_file}" PKGBUILD && mv "${builddir}/PKGBUILD-tmp" "${pkgbuild_file}"
+	else
+		pkgbuild_file="PKGBUILD"
+	fi
+
+
 	# generate new integrity checksums
 	if ! newsums=$(BUILDDIR=${builddir} makepkg_generate_integrity 2>"${status_file}"); then
 		printf 'Failed to generate new checksums'
@@ -81,9 +101,13 @@ pkgbuild_update_checksums() {
 		return 1
 	fi
 
+	if [[ "${pkgbuild_file}" != "PKGBUILD" ]]; then
+		cp PKGBUILD "${builddir}/PKGBUILD-tmp" && mv -f "${pkgbuild_file}" PKGBUILD && mv "${builddir}/PKGBUILD-tmp" "${pkgbuild_file}"
+	fi
+
 	# overwrite the original PKGBUILD while preserving permissions
-	if ! cat -- "${newbuildfile}" > PKGBUILD; then
+	if ! cat -- "${newbuildfile}" > "${pkgbuild_file}"; then
-		printf "Failed to write to the PKGBUILD file"
+		printf "Failed to write to the ${pkgbuild_file} file"
 		return 1
 	fi
 

src/lib/valid-tags.sh

@@ -6,7 +6,6 @@
 # shellcheck disable=2034
 DEVTOOLS_VALID_BINARY_ARCHES=(
 	x86_64
-	aarch64
 )
 
 # shellcheck disable=2034

src/lib/version/upgrade.sh

@@ -37,6 +37,7 @@ pkgctl_version_upgrade_usage() {
 
 		OPTIONS
 		    --no-update-checksums  Disable computation and update of the checksums
+		    --noconfirm            Do not ask to confirm changes made to the PKGBUILD file
 		    -v, --verbose          Display results including up-to-date versions
 		    -h, --help             Show this help text
 
@@ -52,6 +53,8 @@ pkgctl_version_upgrade() {
 	local exit_code=0
 	local current_item=0
 	local update_checksums=1
+	local noconfirm=0
+	local apply_changes=0
 
 	while (( $# )); do
 		case $1 in
@@ -63,6 +66,10 @@ pkgctl_version_upgrade() {
 				update_checksums=0
 				shift
 				;;
+			--noconfirm)
+				noconfirm=1
+				shift
+				;;
 			-v|--verbose)
 				verbose=1
 				shift
@@ -123,7 +130,8 @@ pkgctl_version_upgrade() {
 		# reset common PKGBUILD variables
 		unset pkgbase pkgname arch source pkgver pkgrel validpgpkeys
 		# shellcheck source=contrib/makepkg/PKGBUILD.proto
-		. ./PKGBUILD
+		cp -f PKGBUILD PKGBUILD_version_upgrade.tmp
+		. ./PKGBUILD_version_upgrade.tmp
 		pkgbase=${pkgbase:-$pkgname}
 
 		# update the current terminal spinner status
@@ -140,6 +148,7 @@ pkgctl_version_upgrade() {
 		if ! result=$(get_upstream_version); then
 			result="${BOLD}${pkgbase}${ALL_OFF}: ${result}"
 			failure+=("${result}")
+			rm -f PKGBUILD_version_upgrade.tmp
 			popd >/dev/null
 			continue
 		fi
@@ -148,6 +157,7 @@ pkgctl_version_upgrade() {
 		if ! result=$(vercmp "${upstream_version}" "${pkgver}"); then
 			result="${BOLD}${pkgbase}${ALL_OFF}: failed to compare version ${upstream_version} against ${pkgver}"
 			failure+=("${result}")
+			rm -f PKGBUILD_version_upgrade.tmp
 			popd >/dev/null
 			continue
 		fi
@@ -155,16 +165,19 @@ pkgctl_version_upgrade() {
 		if (( result == 0 )); then
 			result="${BOLD}${pkgbase}${ALL_OFF}: current version ${PURPLE}${pkgver}${ALL_OFF} is latest"
 			up_to_date+=("${result}")
+			rm -f PKGBUILD_version_upgrade.tmp
 		elif (( result < 0 )); then
 			result="${BOLD}${pkgbase}${ALL_OFF}: current version ${PURPLE}${pkgver}${ALL_OFF} is newer than ${DARK_GREEN}${upstream_version}${ALL_OFF}"
 			up_to_date+=("${result}")
+			rm -f PKGBUILD_version_upgrade.tmp
 		elif (( result > 0 )); then
 			result="${BOLD}${pkgbase}${ALL_OFF}: upgraded from version ${PURPLE}${pkgver}${ALL_OFF} to ${DARK_GREEN}${upstream_version}${ALL_OFF}"
 			out_of_date+=("${result}")
+			out_of_date_paths+=("${path}")
 
-			# change the PKGBUILD
+			# make changes to the temporary PKGBUILD file
-			pkgbuild_set_pkgver "${upstream_version}"
+			pkgbuild_set_pkgver "${upstream_version}" PKGBUILD_version_upgrade.tmp
-			pkgbuild_set_pkgrel 1
+			pkgbuild_set_pkgrel 1 PKGBUILD_version_upgrade.tmp
 
 			# download sources and update the checksums
 			if (( update_checksums )); then
@@ -178,9 +191,10 @@ pkgctl_version_upgrade() {
 					"${pkgbase}" \
 					"updating checksums"
 
-				if ! result=$(pkgbuild_update_checksums /dev/null); then
+				if ! result=$(pkgbuild_update_checksums /dev/null PKGBUILD_version_upgrade.tmp); then
 					result="${BOLD}${pkgbase}${ALL_OFF}: failed to update checksums for version ${DARK_GREEN}${upstream_version}${ALL_OFF}"
 					failure+=("${result}")
+					cp PKGBUILD "${status_dir}/PKGBUILD-tmp" && mv -f PKGBUILD_version_upgrade.tmp PKGBUILD && mv "${status_dir}/PKGBUILD-tmp" PKGBUILD_version_upgrade.tmp
 				fi
 			fi
 		fi
@@ -225,6 +239,47 @@ pkgctl_version_upgrade() {
 			"${#failure[@]}"
 	fi
 
+	# upgrade out of date packages
+	for ood_path in "${out_of_date_paths[@]}"; do
+		pushd "${ood_path}" >/dev/null
+
+		# print changes
+		echo
+		diff --unified --color PKGBUILD PKGBUILD_version_upgrade.tmp || true
+
+		# if --noconfirm is passed, directly apply changes without asking for confirmation
+		if (( noconfirm == 1 )); then
+			apply_changes=1
+		else
+			apply_changes=0
+		fi
+
+		# ask confirmation before making changes to the actual PKGBUILD
+		if (( apply_changes == 0 )); then
+			echo
+			if prompt "${GREEN}${BOLD}?${ALL_OFF} Apply changes to the PKGBUILD?"; then
+				apply_changes=1
+			fi
+		fi
+
+		# apply changes to the actual PKGBUILD
+		if (( apply_changes == 1 )); then
+			if ! (diff --unified PKGBUILD PKGBUILD_version_upgrade.tmp || true) | git apply; then
+				msg_error " Fail to apply changes" 2>&1
+				exit_code=1
+			else
+				echo
+				msg_success " Changes applied"
+			fi
+		fi
+
+		# delete temporary PKGBUILD file
+		rm -f PKGBUILD_version_upgrade.tmp
+
+		popd >/dev/null
+
+	done
+
 	# return status based on results
 	return "${exit_code}"
 }