mirror of
				https://gitlab.archlinux.org/archlinux/devtools.git
				synced 2025-10-30 23:34:43 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			c9dd8c03dd
			...
			mr-origin-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | ef6da62956 | 
| @@ -150,7 +150,6 @@ _pkgctl_cmds=( | ||||
| 	db | ||||
| 	diff | ||||
| 	issue | ||||
| 	license | ||||
| 	release | ||||
| 	repo | ||||
| 	search | ||||
|   | ||||
| @@ -39,14 +39,6 @@ placed in the `$XDG_CONFIG_HOME`/nvchecker` directory. This keyfile is | ||||
| used for providing the necessary authentication tokens required for | ||||
| accessing the GitHub or GitLab API. | ||||
|  | ||||
| Combiner Source | ||||
| --------------- | ||||
|  | ||||
| To utilize the combiner source, the `pkgbase` section must be declared as the | ||||
| combiner source. Additionally, individual sections should be added using a | ||||
| quoted table key consisting of the `pkgbase` followed by the stage name, | ||||
| separated by double colons. For example: `["sudo:stage1"]`. | ||||
|  | ||||
| Options | ||||
| ------- | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
| 		unset pkgbase | ||||
|  | ||||
| 		# shellcheck source=contrib/makepkg/PKGBUILD.proto | ||||
| 		if ! . ./PKGBUILD; then | ||||
| 			msg_error "${BOLD}${pkgbase}:${ALL_OFF} failed to source PKGBUILD" | ||||
| 		if [[ ! -f .SRCINFO ]]; then | ||||
| 			msg_error "${BOLD}${path}:${ALL_OFF} no .SRCINFO found" | ||||
| 			return 1 | ||||
| 		fi | ||||
|  | ||||
| 		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" | ||||
|   | ||||
| @@ -191,9 +191,7 @@ path = [ | ||||
|     ".nvchecker.toml", | ||||
|     "*.install", | ||||
|     "*.sysusers", | ||||
|     "*sysusers.conf", | ||||
|     "*.tmpfiles", | ||||
|     "*tmpfiles.conf", | ||||
|     "*.logrotate", | ||||
|     "*.pam", | ||||
|     "*.service", | ||||
|   | ||||
| @@ -304,11 +304,6 @@ get_upstream_version() { | ||||
| 		return 1 | ||||
| 	fi | ||||
|  | ||||
| 	if ! output=$(jq --raw-output --exit-status 'select(.name == "'"${pkgbase}"'")' <<< "${output}"); then | ||||
| 		printf "failed to select pkgbase result from output" | ||||
| 		return 1 | ||||
| 	fi | ||||
|  | ||||
| 	if ! upstream_version=$(jq --raw-output --exit-status '.version' <<< "${output}"); then | ||||
| 		printf "failed to select version from result" | ||||
| 		return 1 | ||||
| @@ -351,7 +346,7 @@ nvchecker_check_config() { | ||||
| 	fi | ||||
|  | ||||
| 	# check if the config contains any section other than pkgbase | ||||
| 	if [[ -n ${pkgbase} ]] && property=$(grep --max-count=1 --perl-regexp "^\\[(?!\"?${pkgbase//+/\\+}(:.+)?\"?\\]).+\\]" < "${config}"); then | ||||
| 	if [[ -n ${pkgbase} ]] && property=$(grep --max-count=1 --perl-regexp "^\\[(?!\"?${pkgbase//+/\\+}\"?\\]).+\\]" < "${config}"); then | ||||
| 		printf "non-pkgbase section not supported in %s: %s" "${config}" "${property}" | ||||
| 		return 1 | ||||
| 	fi | ||||
|   | ||||
		Reference in New Issue
	
	Block a user