diff options
author | classabbyamp <void@placeviolette.net> | 2024-02-10 06:47:06 +0000 |
---|---|---|
committer | classabbyamp <5366828+classabbyamp@users.noreply.github.com> | 2024-02-18 00:48:52 +0000 |
commit | b3c54d73af36bd9f34944f53a5b7500a8e3b87f1 (patch) | |
tree | 283b5dfe2482646437a37f37c9499fc739ef70af /common | |
parent | bdf562aa27a4320acbe686dcefc15d9db0da1bd3 (diff) | |
download | void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.tar void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.tar.gz void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.tar.bz2 void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.tar.lz void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.tar.xz void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.tar.zst void-packages-b3c54d73af36bd9f34944f53a5b7500a8e3b87f1.zip |
common/xbps-src/shutils: add function for printing verbose messages
Diffstat (limited to 'common')
-rw-r--r-- | common/xbps-src/shutils/common.sh | 6 | ||||
-rw-r--r-- | common/xbps-src/shutils/update_check.sh | 33 |
2 files changed, 17 insertions, 22 deletions
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 4083e08ee08..86d91fdf507 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -188,6 +188,12 @@ msg_normal() { fi } +msg_verbose() { + if [ -n "$XBPS_VERBOSE" ]; then + printf >&2 "$@" + fi +} + report_broken() { if [ "$show_problems" = "ignore-problems" ]; then return diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 1dfd9207427..8bae017bbe4 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -8,19 +8,18 @@ update_check() { local urlpfx urlsfx local -A fetchedurls + # XBPS_UPDATE_CHECK_VERBOSE is the old way to show verbose messages + [ "$XBPS_UPDATE_CHECK_VERBOSE" ] && XBPS_VERBOSE="$XBPS_UPDATE_CHECK_VERBOSE" + if [ -r $update_override ]; then . $update_override - if [ "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "using $XBPS_TARGET_PKG/update overrides" 1>&2 - fi + msg_verbose "using $XBPS_TARGET_PKG/update overrides\n" if [ -n "$disabled" ]; then - echo "update-check DISABLED for $original_pkgname: $disabled" 1>&2 + msg_verbose "update-check DISABLED for $original_pkgname: $disabled\n" return 0 fi elif [ -z "$distfiles" ]; then - if [ "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "NO DISTFILES found for $original_pkgname" 1>&2 - fi + msg_verbose "NO DISTFILES found for $original_pkgname\n" return 0 fi @@ -94,9 +93,7 @@ update_check() { esac if [ "$rx" ]; then # substitute url if needed - if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "(folder) fetching $urlpfx and scanning with $rx" 1>&2 - fi + msg_verbose "(folder) fetching $urlpfx and scanning with $rx\n" skipdirs= curl -A "xbps-src-update-check/$XBPS_SRC_VERSION" --max-time 10 -Lsk "$urlpfx" | grep -Po -i "$rx" | @@ -195,15 +192,11 @@ update_check() { rx=${rx:-'(?<!-)\b\Q'"$pkgname"'\E[-_]?((src|source)[-_])?v?\K([^-/_\s]*?\d[^-/_\s]*?)(?=(?:[-_.](?:src|source|orig))?\.(?:[jt]ar|shar|t[bglx]z|tbz2|zip))\b'} if [ "${fetchedurls[$url]}" ]; then - if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "already fetched $url" 1>&2 - fi + msg_verbose "already fetched $url\n" continue fi - if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "fetching $url and scanning with $rx" 1>&2 - fi + msg_verbose "fetching $url and scanning with $rx\n" curl -H 'Accept: text/html,application/xhtml+xml,application/xml,text/plain,application/rss+xml' -A "xbps-src-update-check/$XBPS_SRC_VERSION" --max-time 10 -Lsk "$url" | grep -Po -i "$rx" fetchedurls[$url]=yes @@ -214,9 +207,7 @@ update_check() { grep . || echo "NO VERSION found for $original_pkgname" 1>&2 } | while IFS= read -r found_version; do - if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "found version $found_version" - fi + msg_verbose "found version $found_version\n" consider=true p="$ignore " while [ -n "$p" ]; do @@ -225,9 +216,7 @@ update_check() { case "$found_version" in $i) consider=false - if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then - echo "ignored $found_version due to $i" - fi + msg_verbose "ignored $found_version due to $i\n" esac done if $consider; then |