afm-util: don't reload if afm-install

[src/app-framework-main.git] / scripts / afm-util

diff --git a/scripts/afm-util b/scripts/afm-util
index bbab51b..c5e48eb 100755 (executable)
--- 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
@@ -39,7 +13,9 @@ case "$1" in
 
   add|install)
     f=$(realpath $2)
-    send install '{"wgt":"'"$f"'","force":true}'
+    r=true
+    if [[ "$(basename $0)" = "afm-install" ]]; then r=false; fi
+    send install '{"wgt":"'"$f"'","force":true,"reload":'"$r"'}'
     ;;
 
   remove|uninstall)