From 427adbb8be2c8935336c9f798acbd36868f91bf5 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 2 Mar 2015 18:24:37 +0100 Subject: [PATCH] compare JSON in pretty-printed way, using Python's json.tool --- java/target/compareServers | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/java/target/compareServers b/java/target/compareServers index 1982a3f71e6..0ed959b304a 100755 --- a/java/target/compareServers +++ b/java/target/compareServers @@ -7,18 +7,18 @@ OLDSERVER=$1 NEWSERVER=$2 -wget -O - ${OLDSERVER}/sailingserver/api/v1/leaderboardgroups | sed -e 's/,/\n/g' -e 's/\[/\n/' -e 's/\]/\n/' -e 's/\"//g' | sort >leaderboardgroups.old.sed -wget -O - ${NEWSERVER}/sailingserver/api/v1/leaderboardgroups | sed -e 's/,/\n/g' -e 's/\[/\n/' -e 's/\]/\n/' -e 's/\"//g' | sort >leaderboardgroups.new.sed +wget -O - ${OLDSERVER}/sailingserver/api/v1/leaderboardgroups | sed -e 's/,/\n/g' -e 's/\[/\n/' -e 's/\]/\n/' -e 's/\"//g' | grep -v "^$" | sort >leaderboardgroups.old.sed +wget -O - ${NEWSERVER}/sailingserver/api/v1/leaderboardgroups | sed -e 's/,/\n/g' -e 's/\[/\n/' -e 's/\]/\n/' -e 's/\"//g' | grep -v "^$" | sort >leaderboardgroups.new.sed diff leaderboardgroups.old.sed leaderboardgroups.new.sed if [ "$?" = "0" ]; then cat leaderboardgroups.old.sed | while read i; do - wGET -o "$I.Old.json" "${OLDSERVER}/sailingserver/api/v1/leaderboardgroups/`echo $i | sed -e 's/ /%20/g'`" - wget -O "$i.new.json" "${NEWSERVER}/sailingserver/api/v1/leaderboardgroups/`echo $i | sed -e 's/ /%20/g'`" - diff "$i.old.json" "$i.new.json" + wget -O - "${OLDSERVER}/sailingserver/api/v1/leaderboardgroups/`echo $i | sed -e 's/ /%20/g'`" | python -m json.tool >"$i.old.json" + wget -O - "${NEWSERVER}/sailingserver/api/v1/leaderboardgroups/`echo $i | sed -e 's/ /%20/g'`" | python -m json.tool >"$i.new.json" + diff -b -B "$i.old.json" "$i.new.json" DIFFRESULT=$? - if [ "$DIFFRESULT?' != "0" ]; then - echo Difference detected in leaderboard group $i; exiting + if [ "$DIFFRESULT" != "0" ]; then + echo "Difference detected in leaderboard group $i; exiting" exit $DIFFRESULT fi done