iptables-ipv6 -> iptables

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

diff --git a/update-geoip.sh b/update-geoip.sh
index c95589c554ce3e9f55fe73a685fdc65baeaadd93..3ab52a35a06a0fe1f12372afc49e175359071ba7 100755 (executable)
--- a/update-geoip.sh
+++ b/update-geoip.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -x
 set -e
 
 update=false
@@ -20,18 +19,21 @@ while [ $# -gt 0 ]; do
        esac
 done
 
+dir=$(dirname "$0");
+cd "$dir"
+
 pkgs='GeoIP-db-City GeoIP-db-Country GeoIP-db-IPASNum xtables-geoip'
 for pkg in ${*:-$pkgs}; do
        $status && continue
 
-       ./builder -g -ns $pkg
+       out=$(./builder -g -ns $pkg 2>&1) || echo "$out"
        cd $pkg
 
        $update && rm -vf *.gz *.zip
 
        specfile=*.spec
 
-       ../md5 -p1 $specfile
+       out=$(../md5 -p1 $specfile 2>&1) || echo "$out"
 
        version=$(awk '/^Version:[      ]+/{print $NF}' $specfile)
        if [ $pkg = "xtables-geoip" ]; then
@@ -53,12 +55,12 @@ for pkg in ${*:-$pkgs}; do
                " $specfile
        fi
 
-       ../builder -bb *.spec
+       out=$(../builder -bb *.spec 2>&1) || echo "$out"
        cd ..
 done
 
 for pkg in ${*:-$pkgs}; do
        cd $pkg
-       git status -s
+       git status --porcelain
        cd ..
 done