From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 6 Jul 2017 15:22:49 +0000 (+0200)
Subject: afm-util: make output more readable
X-Git-Tag: 4.99.1~23
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=8c550986fb98fd0848f0af3117e548d4359e3f5a

afm-util: make output more readable

Change-Id: Idfa35a60f3ee6268d2f08304e5ad2248777d2002
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/scripts/afm-util b/scripts/afm-util
index 9313b50..170def6 100755
--- a/scripts/afm-util
+++ b/scripts/afm-util
@@ -6,11 +6,19 @@ fi
 export DBUS_SESSION_BUS_ADDRESS
 
 pretty() {
-	sed \
-		-e '/^method return .*/d' \
-		-e 's/^Error org.freedesktop.DBus.Error.Failed: "\?\(.*\)"\?$/ERROR: \1/' \
-		-e 's/^   string "\(.*\)"/\1/' \
-		-e 's/},/&\n/'
+	sed '	/^method return .*/d
+		s/^Error org.freedesktop.DBus.Error.Failed: "\?\(.*\)"\?$/ERROR: \1/
+		s/^   string "\(.*\)"/\1/
+		s:[[{,]:&\n:g
+		s: *[]}]:\n&:g
+	' |
+	sed '	s:^ *::
+		s: *$::
+		/[]}],*$/ {x;s:...::;x}
+		G
+		/[[{]\n/ {x;s:$:   :;x}
+		s:^\(.*[^\n]\)\n\( *\)$:\2\1:
+	'
 }
 
 send() {