checkVersions: git besser verstehen

3 files changed, 18 insertions, 20 deletions

diff --git a/checkVersions b/checkVersions
index 12de07424..321c4c455 100755
--- a/checkVersions
+++ b/checkVersions
@@ -102,6 +102,7 @@ then
   for src in "${source[@]}" "${source_i686[@]}" "${source_x86_64[@]}"
   do
 
+    src_name="${src%%::*}"
     src="${src#*::}"
 
     if [ "${pkgname}" = 'adduser' ]
@@ -237,7 +238,7 @@ then
           tail -n1
       )"
     elif echo "${src}" | \
-      grep -q '^git://anonscm\.debian\.org/\|^git+https\?://github\.com/.*#tag='
+      grep -q '^git://anonscm\.debian\.org/\|^git\(+https\?\)\?://github\.com/.*#tag='
     then
       src="${src#git+}"
       remVer="$(
@@ -249,20 +250,15 @@ then
           tail -n1
       )"
     elif echo "${src}" | \
-      grep -q '^git\(+[^:]\+\)\?://[^#]\+$'
+      grep -q '^git\(+[^:]\+\)\?://[^#]\+\(#commit=[^#]\+\)\?$'
     then
       remVer=$(
-        set -e
-        tmp_dir=$(mktemp -d)
-        trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
-        cp -r "${pkgname}" "${tmp_dir}"
-        cd "${tmp_dir}/${pkgname}"
-        makepkg -ofcr --noprepare >/dev/null 2>&1
-        makepkg --printsrcinfo | \
-          grep '^\s*pkgver\s*=' | \
-          sed 's|^.*=\s*||'
-      ) || \
-        continue
+        cd "$1"
+        git fetch --all -p > /dev/null 2>&1
+        _commit='HEAD'
+        srcdir=$(pwd)
+        pkgver
+      )
     elif echo "${src}" | \
       grep -q "^https://pypi\.python\.org/packages/"
     then
@@ -517,10 +513,11 @@ then
           'pkgbuild\.com' \
           'qgis\.org' \
           'webhome\.phy\.duke\.edu' \
-          'www\.vandenoever\.info' \
+          'www\.cybernoia\.de' \
+          'www\.gaia-gis\.it' \
           'www\.iozone\.org' \
+          'www\.vandenoever\.info' \
           'www\.wurzel\.org' \
-          'www\.cybernoia\.de' \
           | sed 's@\\|$@\n@'
       )"
     then
@@ -528,8 +525,8 @@ then
       remVer="$( \
         curl_it "${quVer}" | \
           tr '"<>' '\n\n\n' | \
-          grep "^${pkgname}\(-src\)\?-\?[0-9._]\+\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$" | \
-          sed "s@^${pkgname}\(-src\)\?-\?\([0-9._]\+\)\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$@\2@" | \
+          grep "^${pkgname}\(-src\)\?-\?[0-9._]\+[a-z]\?\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$" | \
+          sed "s@^${pkgname}\(-src\)\?-\?\([0-9._]\+[a-z]\?\)\.t\(ar\(\.[gx]z\|\.bz2\)\?\|gz\)\$@\2@" | \
           tr '_' '.' | \
           sort -V | \
           tail -n1
diff --git a/pssh-git/PKGBUILD b/pssh-git/PKGBUILD
index a5f80ceed..a17816bda 100644
--- a/pssh-git/PKGBUILD
+++ b/pssh-git/PKGBUILD
@@ -4,6 +4,7 @@
 
 pkgname=pssh-git
 pkgver=2.3.1+27+ga2f936b
+_commit="${pkgver##*+}"
 pkgrel=1
 pkgdesc="Parallel versions of the openssh tools ssh, scp, rsync, nuke, slurp"
 arch=('any')
@@ -13,12 +14,12 @@ depends=('openssh' 'python')
 makedepends=('git' 'python-setuptools')
 provides=('pssh')
 conflicts=('pssh')
-source=(git+https://github.com/lilydjwg/pssh.git)
+source=(git+https://github.com/lilydjwg/pssh.git#commit=${_commit})
 sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/pssh"
-  git describe --long --tags | \
+  git describe --long --tags ${_commit} | \
     sed '
       s/^v//
       y/-/+/
diff --git a/qgis-git/PKGBUILD b/qgis-git/PKGBUILD
index bf3847433..d3f31dc48 100644
--- a/qgis-git/PKGBUILD
+++ b/qgis-git/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qgis-git
 _pkgname=qgis
 pkgver=2.99.0.r40798.7d4f81d4c6
-_pkgver=2.99.0
+_pkgver=${pkgver%.*.*}
 _commit=${pkgver##*.}
 pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats - Development master'