From 54cc44ff9b3042b339ed570251593f630b07ffd8 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 23 Nov 2016 09:35:34 +0100 Subject: bumpVersion und checkVersions können jetzt auch hash in der url von pypi-Paketen aktualisieren MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bumpVersion | 4 ++-- checkVersions | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bumpVersion b/bumpVersion index f88e43aa..872c3318 100755 --- a/bumpVersion +++ b/bumpVersion @@ -39,8 +39,8 @@ cd "${paket}" sed 's|pkgver=.*$|pkgver='"${remVer}"'|; s|pkgrel=.*$|pkgrel=1|; s@^\s*\(sha[[:digit:]]\+sums\|md5sums\)=@sha512sums=@; - /^\(sha[[:digit:]]\+\|md5\)sums_/d -' -i PKGBUILD + /^\(sha[[:digit:]]\+\|md5\)sums_/d; +'"${sedExtra}" -i PKGBUILD sed ' :begin; diff --git a/checkVersions b/checkVersions index 18cd389e..0c1584a9 100755 --- a/checkVersions +++ b/checkVersions @@ -183,6 +183,19 @@ then sort -V | \ tail -n1 )" + remHash="$( + curl "${qu}${remVer}" 2> /dev/null | \ + tr '"#' '\n' | \ + grep -m1 "^https://pypi\.python\.org/packages/.*/[0-9a-f]\{60\}/${pkgname#*-}-${remVer}\.tar\.\(gz\|bz2\|xz\)\$" | \ + sed 's|/[^/]\+$|/|; s|^https://pypi\.python\.org/packages/|/|' + )" + locHash="$( + echo "${src}" | \ + sed 's|/[^/]\+$|/|; s|^https://pypi\.python\.org/packages/|/|' + )" + ${maschinenlesbar} && \ + [ "${remHash}" != "${locHash}" ] && \ + echo "sedExtra='s@${locHash}@${remHash}@g;'" elif echo "${src}" | \ grep -q "//bundles\.openttdcoop\.org/" then -- cgit v1.2.3-54-g00ecf