mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-13 09:56:18 +02:00
Compare commits
1 Commits
9fe010cf37
...
feat/licen
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7a64d33b88 |
@@ -150,7 +150,6 @@ _pkgctl_cmds=(
|
||||
db
|
||||
diff
|
||||
issue
|
||||
license
|
||||
release
|
||||
repo
|
||||
search
|
||||
|
@@ -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
|
||||
|
@@ -124,7 +124,6 @@ pkgctl_build() {
|
||||
local RELEASE=0
|
||||
local DB_UPDATE=0
|
||||
local INSTALL_TO_HOST=none
|
||||
local UNSUPPORTED_ARCH=0
|
||||
|
||||
local REPO=
|
||||
local PKGVER=
|
||||
@@ -166,8 +165,7 @@ pkgctl_build() {
|
||||
BUILD_ARCH=("${DEVTOOLS_VALID_ARCHES[0]}")
|
||||
elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
|
||||
if ! in_array "${2}" "${DEVTOOLS_VALID_ARCHES[@]}"; then
|
||||
warning 'unsupported architecture: %s' "${2}"
|
||||
UNSUPPORTED_ARCH=1
|
||||
die 'invalid architecture: %s' "${2}"
|
||||
fi
|
||||
BUILD_ARCH+=("${2}")
|
||||
fi
|
||||
@@ -314,9 +312,6 @@ pkgctl_build() {
|
||||
|
||||
# Update pacman cache for auto-detection
|
||||
if [[ -z ${REPO} ]]; then
|
||||
if (( UNSUPPORTED_ARCH )); then
|
||||
die "Unsupported architecture specified, cannot auto-detect repository"
|
||||
fi
|
||||
update_pacman_repo_cache multilib
|
||||
# Check valid repos if not resolved dynamically
|
||||
elif ! in_array "${REPO}" "${DEVTOOLS_VALID_REPOS[@]}"; then
|
||||
@@ -348,7 +343,7 @@ pkgctl_build() {
|
||||
fi
|
||||
|
||||
# fail if an existing package specifies --repo
|
||||
if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]] && (( ! UNSUPPORTED_ARCH )); then
|
||||
if [[ -n "${repo}" ]] && [[ -n ${pkgrepo} ]]; then
|
||||
# allow unstable to use --repo
|
||||
if [[ ${pkgrepo} == *unstable ]]; then
|
||||
repo=${pkgrepo}
|
||||
|
@@ -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"
|
||||
|
@@ -188,13 +188,10 @@ path = [
|
||||
"README.md",
|
||||
"keys/**",
|
||||
".SRCINFO",
|
||||
".gitignore",
|
||||
".nvchecker.toml",
|
||||
"*.install",
|
||||
"*.sysusers",
|
||||
"*sysusers.conf",
|
||||
"*.tmpfiles",
|
||||
"*tmpfiles.conf",
|
||||
"*.logrotate",
|
||||
"*.pam",
|
||||
"*.service",
|
||||
|
Reference in New Issue
Block a user