X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fdiffgdbdir;h=ad1095897300efbb7981b3962424063e0f15ded7;hp=ef1941b8a39f001323f1a80c1d442109720fde26;hb=a944ea1b26260df7f1830305624d3f59ba7c4e1f;hpb=947dd42ddec635940c676f403e6a68cf5c6bf5cb

diff --git a/bin/diffgdbdir b/bin/diffgdbdir
index ef1941b..ad10958 100755
--- a/bin/diffgdbdir
+++ b/bin/diffgdbdir
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 x="*.log"
+x2="foobar"
 o=""
 while true;do
 	if [ "$1" = "-r" ];then
@@ -13,12 +14,17 @@ while true;do
 		shift
 		continue
 	fi
-	if [ "$1" = "log" ];then
+	if [ "$1" = "log" -o "$1" = "-l" ];then
 		x="*.sum"
 		o="-r"
 		shift
 		continue
 	fi
+	if [ "$1" = "pie" ];then
+		x2="*pie*"
+		shift
+		continue
+	fi
 	break
 done
 
@@ -28,34 +34,42 @@ if [ $# != 2 ];then
 fi
 
 diffed=false
-function diffit
+function diffitraw
 {
-	dir1=$1/out
-	dir2=$2/out
+	dir1=$1
+	dir2=$2
 	if [ ! -e "$dir2" ];then
 		echo "MISSING: $dir1 $dir2"
 		return
 	fi
-	diffgdb $o -x "$x" $dir1 $dir2
+	diffgdb $o -x rpm-qa -x "$x" -x "$x2" $dir1 $dir2
 	diffed=true
 }
+function diffit
+{
+	diffitraw $1/out $2/out
+}
 
-if [ -f "$1" -a ! -e "${1%.tar.xz}" ];then
-	(
-		cd "$(dirname "$1")"
-		tar xJf "$(basename "$1")"
-	)
+if [ -f "$1" ];then
+	if [ ! -e "${1%.tar.xz}" ];then
+		(
+			cd "$(dirname "$1")"
+			tar xJf "$(basename "$1")"
+		)
+	fi
 	set "${1%.tar.xz}" "$2"
 	if [ ! -d "$1" ];then
 		echo "! $1"
 		exit 1
 	fi
 fi
-if [ -f "$2" -a ! -e "${2%.tar.xz}" ];then
-	(
-		cd "$(dirname "$2")"
-		tar xJf "$(basename "$2")"
-	)
+if [ -f "$2" ];then
+	if [ ! -e "${2%.tar.xz}" ];then
+		(
+			cd "$(dirname "$2")"
+			tar xJf "$(basename "$2")"
+		)
+	fi
 	set "$1" "${2%.tar.xz}"
 	if [ ! -d "$2" ];then
 		echo "! $2"
@@ -78,6 +92,11 @@ if [ -d $1/out ];then
 	diffit $1 $2
 	diffed=true
 fi
+if [ "$1" != "${1#tests/}" -a -d $1 ];then
+	diffitraw $1 $2
+	diffed=true
+fi
 if ! $diffed;then
-	echo "NOT FOUND: $1 $2"
+	diffitraw $1 $2
+	#echo "NOT FOUND: $1 $2"
 fi