Compare commits

..

1 Commits

Author SHA1 Message Date
Levente Polyak
ef6da62956 chore(license): avoid sourcing PKGBUILD in check subcommand
We don't actually need any data from the package, except the pkgbase
which is exclusively used during logging. Simply grep the pkgbase name
and use the path during early code path issues.

Component: pkgctl license check
2025-08-02 06:29:26 +02:00
5 changed files with 10 additions and 42 deletions

View File

@@ -150,7 +150,6 @@ _pkgctl_cmds=(
db db
diff diff
issue issue
license
release release
repo repo
search search

View File

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
if [[ ! -f "${file}" ]]; then if [[ ! -f "${file}" ]]; then
continue continue
fi 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" die "%s is not under version control" "$file"
fi fi
done done

View File

@@ -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"

View File

@@ -191,9 +191,7 @@ path = [
".nvchecker.toml", ".nvchecker.toml",
"*.install", "*.install",
"*.sysusers", "*.sysusers",
"*sysusers.conf",
"*.tmpfiles", "*.tmpfiles",
"*tmpfiles.conf",
"*.logrotate", "*.logrotate",
"*.pam", "*.pam",
"*.service", "*.service",

View File

@@ -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'
@@ -437,7 +408,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%%" \