Merge branch 'master' into 'master'

feat(pkgctl_auth_login): generate the login token via SSH

Closes #262

See merge request archlinux/devtools!309

contrib/completion/bash/devtools.in

@@ -150,6 +150,7 @@ _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"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done

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,10 +82,17 @@ pkgctl_auth_login() {
 	environment variable using a vault, see pkgctl-auth-login(1) for details.
 _EOF_
 
-	if (( GEN_ACESS_TOKEN )); then
+	if (( USE_SSH )); then
-		xdg-open "${personal_access_token_url}" 2>/dev/null
+		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
 
+	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
@@ -88,6 +101,7 @@ _EOF_
 			msg_error "  No token provided"
 			exit 1
 		fi
+	fi
 
 	# check if the passed token works
 	GITLAB_TOKEN="${token}"

src/lib/license/check.sh

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

@@ -188,10 +188,13 @@ path = [
     "README.md",
     "keys/**",
     ".SRCINFO",
+    ".gitignore",
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
+    "*sysusers.conf",
     "*.tmpfiles",
+    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",