From 7e97a37c4f406b1691eaa186591b591a2c26161b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 8 Dec 2018 16:20:25 +0100
Subject: Refine diff check for compiled thrift classes

---
 thrift-compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/thrift-compile.sh b/thrift-compile.sh
index f7a6561..c47cc86 100755
--- a/thrift-compile.sh
+++ b/thrift-compile.sh
@@ -18,8 +18,8 @@ if thrift --gen java src/main/thrift/bwlp.thrift; then
 		bn=$(basename "$file")
 		if [ -e "src/main/java/org/openslx/bwlp/thrift/iface/$bn" ]; then
 			diff -q \
-				<(sed -r 's/_i[0-9]+/_ix/g;s/_iter[0-9]+/_iterx/g;s/_elem[0-9]+/_elemx/g;s/_list[0-9]+/_listx/g;/@Generated/d' "$file") \
-				<(sed -r 's/_i[0-9]+/_ix/g;s/_iter[0-9]+/_iterx/g;s/_elem[0-9]+/_elemx/g;s/_list[0-9]+/_listx/g;/@Generated/d' "src/main/java/org/openslx/bwlp/thrift/iface/$bn")
+				<(sed -r 's/_(i|iter|elem|list|map|key|val)[0-9]+/\1x/g;/@Generated/d' "$file") \
+				<(sed -r 's/_(i|iter|elem|list|map|key|val)[0-9]+/\1x/g;/@Generated/d' "src/main/java/org/openslx/bwlp/thrift/iface/$bn")
 			ret=$?
 			[ "$ret" = 0 ] && continue
 		fi
-- 
cgit v1.2.3-55-g7522