iptables-ipv6 -> iptables

[packages/rpm-build-tools.git] / update-geoip.sh

diff --git a/update-geoip.sh b/update-geoip.sh
old mode 100644 (file)
new mode 100755 (executable)
index ba4421f..3ab52a3
--- a/update-geoip.sh
+++ b/update-geoip.sh
@@ -1,26 +1,66 @@
 #!/bin/sh
-set -x
 set -e
+
+update=false
+status=false
+while [ $# -gt 0 ]; do
+       case "$1" in
+       update|-update|--update)
+               update=true
+               shift
+               ;;
+       status|-status|--status)
+               status=true
+               shift
+               ;;
+       *)
+               break
+               ;;
+       esac
+done
+
+dir=$(dirname "$0");
+cd "$dir"
+
 pkgs='GeoIP-db-City GeoIP-db-Country GeoIP-db-IPASNum xtables-geoip'
 for pkg in ${*:-$pkgs}; do
-       ./builder -g -ns $pkg
+       $status && continue
+
+       out=$(./builder -g -ns $pkg 2>&1) || echo "$out"
        cd $pkg
-       rm -vf *.gz *.zip
+
+       $update && rm -vf *.gz *.zip
+
        specfile=*.spec
-       ../md5 $specfile
+
+       out=$(../md5 -p1 $specfile 2>&1) || echo "$out"
+
        version=$(awk '/^Version:[      ]+/{print $NF}' $specfile)
-       if [ $pkg = xtables-geoip ]; then
-               dt=$(stat -c %y *.zip | awk '{print $1}' | tr -d -)
+       if [ $pkg = "xtables-geoip" ]; then
+               dt4=$(TZ=GMT stat -c '%y' *.zip | awk '{print $1}' | tr -d -)
+               dt6=$(TZ=GMT stat -c '%y' *.gz | awk '{print $1}' | tr -d -)
+               if [ "$dt4" -gt "$dt6" ]; then
+                       dt=$dt4
+               else
+                       dt=$dt6
+               fi
        else
-               dt=$(stat -c %y *.gz | awk '{print $1}' | tr - .)
+               dt=$(TZ=GMT stat -c %y *.gz | awk '{print $1}' | tr - .)
        fi
        if [ "$version" != "$dt" ]; then
                version=$dt
                sed -i -e "
                        s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
+                       s/^\(Release:[ \t]\+\)[.0-9]\+\$/\11/
                " $specfile
        fi
 
-       ../builder -bb *.spec
+       out=$(../builder -bb *.spec 2>&1) || echo "$out"
+       cd ..
+done
+
+for pkg in ${*:-$pkgs}; do
+       cd $pkg
+       git status --porcelain
        cd ..
 done