mirror of
https://gitlab.archlinux.org/archlinux/devtools.git
synced 2025-10-05 20:16:19 +02:00
Compare commits
9 Commits
4da854c526
...
master
Author | SHA1 | Date | |
---|---|---|---|
![]() |
5835e20136 | ||
![]() |
7c3fcf9c16 | ||
![]() |
82ddc7b3bd | ||
![]() |
1bcbdde3fa | ||
![]() |
062c678119 | ||
![]() |
bd4dc54fbb | ||
![]() |
a46cb8150c | ||
![]() |
447f7b4117 | ||
![]() |
3f0ebbc6d2 |
@@ -3,7 +3,7 @@ pkgctl-auth(1)
|
|||||||
|
|
||||||
Name
|
Name
|
||||||
----
|
----
|
||||||
pkgctl-auth - Authenticate with serivces like GitLab.
|
pkgctl-auth - Authenticate with services like GitLab.
|
||||||
|
|
||||||
Synopsis
|
Synopsis
|
||||||
--------
|
--------
|
||||||
|
@@ -39,6 +39,17 @@ placed in the `$XDG_CONFIG_HOME`/nvchecker` directory. This keyfile is
|
|||||||
used for providing the necessary authentication tokens required for
|
used for providing the necessary authentication tokens required for
|
||||||
accessing the GitHub or GitLab API.
|
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"]`.
|
||||||
|
|
||||||
|
This allows to chain different sources together into one result, or allow
|
||||||
|
multi stage transformation of our source via multiple regex.
|
||||||
|
|
||||||
Options
|
Options
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
@@ -49,6 +49,9 @@ pkgctl diff::
|
|||||||
pkgctl issue::
|
pkgctl issue::
|
||||||
Work with GitLab packaging issues
|
Work with GitLab packaging issues
|
||||||
|
|
||||||
|
pkgctl license::
|
||||||
|
Check and manage package licenses
|
||||||
|
|
||||||
pkgctl release::
|
pkgctl release::
|
||||||
Release step to commit, tag and upload build artifacts
|
Release step to commit, tag and upload build artifacts
|
||||||
|
|
||||||
@@ -70,6 +73,7 @@ pkgctl-build(1)
|
|||||||
pkgctl-db(1)
|
pkgctl-db(1)
|
||||||
pkgctl-diff(1)
|
pkgctl-diff(1)
|
||||||
pkgctl-issue(1)
|
pkgctl-issue(1)
|
||||||
|
pkgctl-license(1)
|
||||||
pkgctl-release(1)
|
pkgctl-release(1)
|
||||||
pkgctl-repo(1)
|
pkgctl-repo(1)
|
||||||
pkgctl-search(1)
|
pkgctl-search(1)
|
||||||
|
@@ -54,7 +54,8 @@ export RSYNC_OPTS=(
|
|||||||
--human-readable
|
--human-readable
|
||||||
--progress
|
--progress
|
||||||
--partial
|
--partial
|
||||||
--partial-dir=.partial
|
# suffix the partial dir with the PID in order to avoid clashes
|
||||||
|
--partial-dir=.partial.$$
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -441,3 +442,10 @@ relative_date_unit() {
|
|||||||
done
|
done
|
||||||
printf "1 second"
|
printf "1 second"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# escapes regex metacharacters in a given string
|
||||||
|
regex_escape() {
|
||||||
|
# shellcheck disable=SC2001,SC2016
|
||||||
|
sed 's/[\^.\[$()|*+?{\\]/\\&/g' <<<"$1"
|
||||||
|
}
|
||||||
|
@@ -94,19 +94,19 @@ pkgctl_license_check() {
|
|||||||
pushd "${path}" >/dev/null
|
pushd "${path}" >/dev/null
|
||||||
|
|
||||||
if [[ ! -f PKGBUILD ]]; then
|
if [[ ! -f PKGBUILD ]]; then
|
||||||
msg_error "${BOLD}${pkgbase}:${ALL_OFF} no PKGBUILD found"
|
msg_error "${BOLD}${path}:${ALL_OFF} no PKGBUILD found"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# reset common PKGBUILD variables
|
if [[ ! -f .SRCINFO ]]; then
|
||||||
unset pkgbase
|
msg_error "${BOLD}${path}:${ALL_OFF} no .SRCINFO found"
|
||||||
|
return 1
|
||||||
# shellcheck source=contrib/makepkg/PKGBUILD.proto
|
fi
|
||||||
if ! . ./PKGBUILD; then
|
|
||||||
msg_error "${BOLD}${pkgbase}:${ALL_OFF} failed to source PKGBUILD"
|
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
|
return 1
|
||||||
fi
|
fi
|
||||||
pkgbase=${pkgbase:-$pkgname}
|
|
||||||
|
|
||||||
if [[ ! -e LICENSE ]]; then
|
if [[ ! -e LICENSE ]]; then
|
||||||
msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"
|
msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"
|
||||||
|
@@ -188,6 +188,7 @@ path = [
|
|||||||
"README.md",
|
"README.md",
|
||||||
"keys/**",
|
"keys/**",
|
||||||
".SRCINFO",
|
".SRCINFO",
|
||||||
|
".gitignore",
|
||||||
".nvchecker.toml",
|
".nvchecker.toml",
|
||||||
"*.install",
|
"*.install",
|
||||||
"*.sysusers",
|
"*.sysusers",
|
||||||
|
@@ -6,6 +6,8 @@
|
|||||||
DEVTOOLS_INCLUDE_UTIL_PKGBUILD_SH=1
|
DEVTOOLS_INCLUDE_UTIL_PKGBUILD_SH=1
|
||||||
|
|
||||||
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
|
_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
|
||||||
|
# shellcheck source=src/lib/common.sh
|
||||||
|
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
|
||||||
# shellcheck source=src/lib/util/makepkg.sh
|
# shellcheck source=src/lib/util/makepkg.sh
|
||||||
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/makepkg.sh
|
source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/makepkg.sh
|
||||||
|
|
||||||
@@ -21,6 +23,8 @@ pkgbuild_set_pkgver() {
|
|||||||
local new_pkgver=$1
|
local new_pkgver=$1
|
||||||
local pkgver=${pkgver}
|
local pkgver=${pkgver}
|
||||||
|
|
||||||
|
pkgver="$(regex_escape "${pkgver}")"
|
||||||
|
|
||||||
if [[ $(type -t pkgver) == function ]]; then
|
if [[ $(type -t pkgver) == function ]]; then
|
||||||
# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
|
# 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'
|
warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
|
||||||
|
@@ -140,32 +140,6 @@ pkgctl_version_check() {
|
|||||||
pushd "${path}" >/dev/null
|
pushd "${path}" >/dev/null
|
||||||
|
|
||||||
if [[ ${output_format} == pretty ]]; then
|
if [[ ${output_format} == pretty ]]; then
|
||||||
# initialize the tmp file for status output
|
|
||||||
section_separator=''
|
|
||||||
printf "" > "${status_dir}/tmp"
|
|
||||||
|
|
||||||
# update the current list of failed packages
|
|
||||||
if (( ${#failure[@]} > 0 )); then
|
|
||||||
exit_code=${PKGCTL_VERSION_CHECK_EXIT_FAILURE}
|
|
||||||
printf "%sFailure%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}" >> "${status_dir}/tmp" 2>&1
|
|
||||||
section_separator=$'\n'
|
|
||||||
for result in "${failure[@]}"; do
|
|
||||||
msg_error " ${result}" >> "${status_dir}/tmp" 2>&1
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# update the current list of out-of-date packages
|
|
||||||
if (( ${#out_of_date[@]} > 0 )); then
|
|
||||||
exit_code=${PKGCTL_VERSION_CHECK_EXIT_OUT_OF_DATE}
|
|
||||||
printf "%sOut-of-date%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}" >> "${status_dir}/tmp" 2>&1
|
|
||||||
section_separator=$'\n'
|
|
||||||
for result in "${out_of_date[@]}"; do
|
|
||||||
msg_warn " ${result}" >> "${status_dir}/tmp" 2>&1
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
printf "%s" "${section_separator}" >> "${status_dir}/tmp"
|
|
||||||
|
|
||||||
# update the current terminal spinner status
|
# update the current terminal spinner status
|
||||||
(( ++current_item ))
|
(( ++current_item ))
|
||||||
pkgctl_version_check_spinner \
|
pkgctl_version_check_spinner \
|
||||||
@@ -243,9 +217,6 @@ pkgctl_version_check() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# reset the section separator after loop
|
|
||||||
section_separator=''
|
|
||||||
|
|
||||||
if (( verbose )) && (( ${#up_to_date[@]} > 0 )); then
|
if (( verbose )) && (( ${#up_to_date[@]} > 0 )); then
|
||||||
printf "%sUp-to-date%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}"
|
printf "%sUp-to-date%s\n" "${section_separator}${BOLD}${UNDERLINE}" "${ALL_OFF}"
|
||||||
section_separator=$'\n'
|
section_separator=$'\n'
|
||||||
@@ -333,6 +304,11 @@ get_upstream_version() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
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
|
if ! upstream_version=$(jq --raw-output --exit-status '.version' <<< "${output}"); then
|
||||||
printf "failed to select version from result"
|
printf "failed to select version from result"
|
||||||
return 1
|
return 1
|
||||||
@@ -375,10 +351,16 @@ nvchecker_check_config() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# check if the config contains any section other than pkgbase
|
# 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}"
|
printf "non-pkgbase section not supported in %s: %s" "${config}" "${property}"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# check if the config is using the 'cmd' source
|
||||||
|
if grep --extended-regexp --quiet '^\s*source\s*=\s*["'\'']cmd["'\''].*' "${config}"; then
|
||||||
|
printf "using the 'cmd' source in %s is disallowed" "${config}"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
nvchecker_check_error() {
|
nvchecker_check_error() {
|
||||||
@@ -437,7 +419,7 @@ pkgctl_version_check_spinner() {
|
|||||||
pkgctl_version_check_summary \
|
pkgctl_version_check_summary \
|
||||||
"${up_to_date_count}" \
|
"${up_to_date_count}" \
|
||||||
"${out_of_date_count}" \
|
"${out_of_date_count}" \
|
||||||
"${failure_count}" >> "${tmp_file}"
|
"${failure_count}" > "${tmp_file}"
|
||||||
|
|
||||||
# print the progress status
|
# print the progress status
|
||||||
printf "📡 Checking: %s/%s [%s] %%spinner%%" \
|
printf "📡 Checking: %s/%s [%s] %%spinner%%" \
|
||||||
|
Reference in New Issue
Block a user