X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=update-geoip.sh;h=3ab52a35a06a0fe1f12372afc49e175359071ba7;hb=202b825e4bf39de168b9939434900024e14841d9;hp=65159ab03a7bbbe84e0b4a01758c06917cfe0a4b;hpb=e55f7969b4ca40a9284c228d2824b60a1c200176;p=packages%2Frpm-build-tools.git

diff --git a/update-geoip.sh b/update-geoip.sh
old mode 100644
new mode 100755
index 65159ab..3ab52a3
--- a/update-geoip.sh
+++ b/update-geoip.sh
@@ -1,18 +1,51 @@
 #!/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 -p1 $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
@@ -22,6 +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 --porcelain
 	cd ..
 done