Merge branch 'master' into 'master'

feat(pkgctl_auth_login): generate the login token via SSH Closes #262 See merge request archlinux/devtools!309
fix(commitpkg): Quiet git ls-files output
2025-10-30 23:34:43 +01:00 · 2025-08-02 02:00:38 +00:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00 · 2025-03-05 05:36:28 +00:00
3 changed files with 25 additions and 9 deletions
--- 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/auth/login.sh
+++ b/src/lib/auth/login.sh
@@ -33,11 +33,13 @@ pkgctl_auth_login_usage() {

 		OPTIONS
 		    -g, --gen-access-token   Open the URL to generate a new personal access token
+		    -s, --gen-ssh-token      Directly generate the token via SSH (only works if your gitlab is already configured with SSH)
 		    -h, --help               Show this help text

 		EXAMPLES
 		    $ ${COMMAND}
 		    $ ${COMMAND} --gen-access-token
+		    $ ${COMMAND} --gen-ssh-token
 _EOF_
 }

@@ -53,6 +55,10 @@ pkgctl_auth_login() {
 				pkgctl_auth_login_usage
 				exit 0
 				;;
+			-s|--gen-ssh-token)
+				USE_SSH=1
+				shift
+				;;
 			-g|--gen-access-token)
 				GEN_ACESS_TOKEN=1
 				shift
@@ -76,17 +82,25 @@ pkgctl_auth_login() {
 	environment variable using a vault, see pkgctl-auth-login(1) for details.
 _EOF_

-	if (( GEN_ACESS_TOKEN )); then
-		xdg-open "${personal_access_token_url}" 2>/dev/null
+	if (( USE_SSH )); then
+		token=$(ssh git@gitlab.archlinux.org personal_access_token pkgctl api,write_repository 30)
+		if [[ $? -ne 0 ]]; then
+			msg_error "  Failed to generate token via SSH"
+			exit 1
+		fi
+		token=$(echo "$token" | grep 'Token:' | awk '{print $2}')
 	fi

-	# read token from stdin
-	read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
-	echo
+	if (( GEN_ACESS_TOKEN )); then
+		xdg-open "${personal_access_token_url}" 2>/dev/null
+		# read token from stdin
+		read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
+		echo

-	if [[ -z ${token} ]]; then
-		msg_error "  No token provided"
-		exit 1
+		if [[ -z ${token} ]]; then
+			msg_error "  No token provided"
+			exit 1
+		fi
 	fi

 	# check if the passed token works
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -191,7 +191,9 @@ path = [
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
Author	SHA1	Message	Date
keypair	c738d84e23	Merge branch 'master' into 'master' feat(pkgctl_auth_login): generate the login token via SSH Closes #262 See merge request archlinux/devtools!309	2025-08-02 02:00:38 +00: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
keypair	34c7f0053f	feat(pkgctl_auth_login): generate the login token via SSH	2025-03-05 05:36:28 +00:00