X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fafm-util;fp=scripts%2Fafm-util;h=4d86218df03bf235709538eac2bfe9a05690c52d;hb=b5c95cf683a396f1b8dbd0f3edd093f2f1edf838;hp=bbab51b2452e9929919186b5e0429095ab4e26ca;hpb=971d4e96d6b14c01e8eae4f6e9910bc5859adfb1;p=src%2Fapp-framework-main.git

diff --git a/scripts/afm-util b/scripts/afm-util
index bbab51b..4d86218 100755
--- a/scripts/afm-util
+++ b/scripts/afm-util
@@ -1,34 +1,8 @@
 #!/bin/bash
 
-if [ "x" = "x${DBUS_SESSION_BUS_ADDRESS}" ]; then
-	DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus"
-fi
-export DBUS_SESSION_BUS_ADDRESS
-
-pretty() {
-	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() {
-	dbus-send --session --print-reply \
-		--dest=org.AGL.afm.user \
-		/org/AGL/afm/user \
-		org.AGL.afm.user.$1 \
-		"string:$2" |
-	pretty
-	return ${PIPESTATUS[0]}
+	afb-client-demo -H -d unix:/run/afm/apis/ws/afm-main "$1" "$2" |
+	awk '$1=="ON-REPLY-FAIL"{$1="ERROR:";$2="";print;exit 1;}NR>1'
 }
 
 case "$1" in