mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-09-13 18:06:19 +02:00
Compare commits
1 Commits
2b2d224776
...
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
|
||||
|
@@ -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",
|
||||
|
@@ -14,11 +14,6 @@ source /usr/share/makepkg/util/schema.sh
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
# escapes regex metacharacters in a given string
|
||||
_escape_pkgver() {
|
||||
# shellcheck disable=SC2001
|
||||
sed 's:[\^.\[$()|*+?{\\]:\\&:g' <<<"$1"
|
||||
}
|
||||
|
||||
# set the pkgver variable in a PKGBUILD
|
||||
# assumes that the pkgbuild is sourced to detect the presence of a pkgver function
|
||||
@@ -26,8 +21,6 @@ pkgbuild_set_pkgver() {
|
||||
local new_pkgver=$1
|
||||
local pkgver=${pkgver}
|
||||
|
||||
pkgver="$(_escape_pkgver "${pkgver}")"
|
||||
|
||||
if [[ $(type -t pkgver) == function ]]; then
|
||||
# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
|
||||
warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
|
||||
|
Reference in New Issue
Block a user