From e2b63458be8a97d4f245e31225a4880fc5015f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 13 Apr 2018 16:36:37 +0200 Subject: [PATCH] xbps-src: update-check: handle underscores in upstream version string --- common/xbps-src/shutils/update_check.sh | 1 + srcpkgs/iverilog/update | 1 - srcpkgs/lowdown/update | 3 --- srcpkgs/portaudio/update | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh index 1c9ceafcb15..ae8212ecc96 100644 --- a/common/xbps-src/shutils/update_check.sh +++ b/common/xbps-src/shutils/update_check.sh @@ -75,6 +75,7 @@ update_check() { curl -A "xbps-src-update-check/$XBPS_SRC_VERSION" --max-time 10 -Lsk "$url" | grep -Po -i "$rx" done | + tr _ . | sort -Vu | { grep . || echo "NO VERSION found for $original_pkgname" 1>&2 diff --git a/srcpkgs/iverilog/update b/srcpkgs/iverilog/update index 1047fd57c00..75701c1ac2e 100644 --- a/srcpkgs/iverilog/update +++ b/srcpkgs/iverilog/update @@ -1,3 +1,2 @@ site="https://api.github.com/repos/steveicarus/$pkgname/tags" pattern='"name":\s*"v\K[\d_]+(?=")' -version=${version//./_} diff --git a/srcpkgs/lowdown/update b/srcpkgs/lowdown/update index ae8b68fb708..f18efbf9cfb 100644 --- a/srcpkgs/lowdown/update +++ b/srcpkgs/lowdown/update @@ -1,4 +1 @@ -# This pattern is incomplete, it finds out the versions like '0_3_1' but -# comparison with 'xbps-uhelper cmpver' results in it being always treated -# as a lower version pattern="VERSION_\K[\d_]+" diff --git a/srcpkgs/portaudio/update b/srcpkgs/portaudio/update index a6b177b1139..6d40d6109f6 100644 --- a/srcpkgs/portaudio/update +++ b/srcpkgs/portaudio/update @@ -1,3 +1,2 @@ -version="${version/./_}" site='http://www.portaudio.com/download.html' pattern='archives/pa_stable_v\K[0-9_]+(?=\.tgz)'