fix(license): add .gitignore to REUSE defaults

36 packages use this while 26 use *.pam and 21 use *.logrotate. Seems anecdotally common enough to add this here.
fix(completion): fix bash completion for the license subcommand
2025-09-13 09:56:18 +02:00 · 2025-08-08 14:13:32 +02:00 · 2025-08-05 17:48:12 +02:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00
4 changed files with 18 additions and 43 deletions
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done
--- a/src/lib/db/move.sh
+++ b/src/lib/db/move.sh
@@ -8,8 +8,6 @@ DEVTOOLS_INCLUDE_DB_MOVE_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/valid-repos.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh

 set -e

@@ -22,7 +20,6 @@ pkgctl_db_move_usage() {
 		Move packages between binary repositories.

 		OPTIONS
-		    --noconfirm      Bypass any confirmation messages, should only be used with caution
 		    -h, --help         Show this help text

 		EXAMPLES
@@ -32,12 +29,9 @@ _EOF_
 }

 pkgctl_db_move() {
-	if (( $# < 3 )); then
-		pkgctl_db_move_usage
-		exit 1
-	fi
-
-	local CONFIRM=1
+	local SOURCE_REPO=""
+	local TARGET_REPO=""
+	local PKGBASES=()

 	# option checking
 	while (( $# )); do
@@ -46,10 +40,6 @@ pkgctl_db_move() {
 				pkgctl_db_move_usage
 				exit 0
 				;;
-			--noconfirm)
-				CONFIRM=0
-				shift
-				;;
 			-*)
 				die "invalid argument: %s" "$1"
 				;;
@@ -59,35 +49,16 @@ pkgctl_db_move() {
 		esac
 	done

-	local source_repo=$1
-	local target_repo=$2
+	if (( $# < 3 )); then
+		pkgctl_db_move_usage
+		exit 1
+	fi
+
+	SOURCE_REPO=$1
+	TARGET_REPO=$2
 	shift 2
+	PKGBASES+=("$@")

-	if ! in_array "${source_repo}" "${DEVTOOLS_VALID_REPOS[@]}"; then
-		die "Invalid source repository: %s" "${source_repo}"
-	fi
-	if ! in_array "${target_repo}" "${DEVTOOLS_VALID_REPOS[@]}"; then
-		die "Invalid target repository: %s" "${target_repo}"
-	fi
-
-	if (( CONFIRM )); then
-		local pkglist
-		pkglist=$(printf '%s\n' "$@" | paste -sd ' ')
-		read -r -p "Move packages from [${source_repo}] to [${target_repo}]: ${pkglist}? [Y/n] " response
-		case ${response} in
-			[Yy][Ee][Ss]|[Yy]|'')
-				: # continue
-				;;
-			*)
-				exit 0
-				;;
-		esac
-	fi
-
-	local pkgbase
-	for pkgbase in "$@"; do
-		msg "Moving [%s] from [%s] to [%s]" "${pkgbase}" "${source_repo}" "${target_repo}"
-		# shellcheck disable=SC2046
-		db-move "${source_repo}" "${target_repo}" $(pacman -Sql "${source_repo}" | grep "^${pkgbase}" || echo "${pkgbase}")
-	done
+	# shellcheck disable=SC2029
+	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-move "${SOURCE_REPO}" "${TARGET_REPO}" "${PKGBASES[@]}"
 }
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -188,10 +188,13 @@ path = [
    "README.md",
    "keys/**",
    ".SRCINFO",
+    ".gitignore",
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
Author	SHA1	Message	Date
Aaron Liu	3f0ebbc6d2	fix(license): add .gitignore to REUSE defaults 36 packages use this while 26 use .pam and 21 use .logrotate. Seems anecdotally common enough to add this here.	2025-08-08 14:13:32 +02:00
Jakub Klinkovský	fc56ebedf3	fix(completion): fix bash completion for the license subcommand Signed-off-by: Jakub Klinkovský <lahwaacz@archlinux.org>	2025-08-05 17:48:12 +02:00
Christian Heusel	01757e6904	fix(commitpkg): Quiet git ls-files output So far all files in `needsversioning=(...)` have been printed to the command line if they were found, which is not useful, especially now that we have more files present there. It makes sense however to keep the standard error output, as this gives a actionable suggestion what one should to to fix the issue: > error: pathspec 'PKGBUILD' did not match any file(s) known to git > Did you forget to 'git add'? Fixes #281 Signed-off-by: Christian Heusel <christian@heusel.eu>	2025-08-01 11:26:57 +02:00
Daniel M. Capella	c5fe8ff3e6	feat(license): Extend matches for sysusers/tmpfiles configs Eg. to match: - sysusers.conf - $pkgname.sysusers - $pkgname.sysusers.conf	2025-07-28 23:38:32 -04:00