X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fafm-util;h=60434a7410633c1a079e110470d668ed4b29d22b;hb=353f837dd260914d814748cc196d129234ba265f;hp=f5da0e1e52dfec8537bb032de043536990b25650;hpb=4ce25d0ddbcfe1111f0adbf63b4d73f19e926d8b;p=src%2Fapp-framework-main.git

diff --git a/scripts/afm-util b/scripts/afm-util
index f5da0e1..60434a7 100755
--- a/scripts/afm-util
+++ b/scripts/afm-util
@@ -1,11 +1,25 @@
 #!/bin/sh
 
 if [ "x" = "x${DBUS_SESSION_BUS_ADDRESS}" ]; then
-	DBUS_SESSION_BUS_ADDRESS:=unix:path=/run/user/$UID/bus
+	DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
 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/'
+}
 
 send() {
-	dbus-send --session --dest=org.AGL.afm.user --print-reply /org/AGL/afm/user org.AGL.afm.user.$1 "string:$2"
+	dbus-send --session --print-reply \
+		--dest=org.AGL.afm.user \
+		/org/AGL/afm/user \
+		org.AGL.afm.user.$1 \
+		"string:$2" |
+	pretty
 }
 
 case "$1" in
@@ -82,8 +96,8 @@ The commands are:
   run id
   start id       start an instance of the widget of id
 
-  terminate rid
-  kill rid       terminate the running instance rid
+  kill rid
+  terminate rid       terminate the running instance rid
 
   stop rid
   pause rid      stop the running instance rid
@@ -91,8 +105,8 @@ The commands are:
   resume rid
   continue rid   continue the previously rid
 
-  state rid
-  status rid     get status of the running instance rid
+  status rid
+  state rid     get status of the running instance rid
 
 EOC
     ;;