afm-util: Remove legacy commands stop/resume

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

diff --git a/scripts/afm-util.in b/scripts/afm-util.in
index 40bc7da..2cc714b 100755 (executable)
--- a/scripts/afm-util.in
+++ b/scripts/afm-util.in
@@ -2,13 +2,20 @@
 
 send() {
        afb-client-demo -H -d unix:@afm_platform_rundir@/apis/ws/afm-main "$1" "$2" |
-       awk '$1=="ON-REPLY-FAIL"{$1="ERROR:";$2="";print;exit 1;}NR>1'
+       awk '$1=="ON-REPLY" && $3!="success"{$1="ERROR:";$2="";print > "/dev/stderr";exit 1;}NR>1'
+}
+
+getall() {
+  case "$1" in
+    -a|--all) echo -n '{"all":true}';;
+    *) echo -n true;;
+  esac
 }
 
 case "$1" in
 
   list|runnables)
-    send runnables true
+    send runnables $(getall $2)
     ;;
 
   add|install)
@@ -29,7 +36,7 @@ case "$1" in
     ;;
 
   ps|runners)
-    send runners true
+    send runners  $(getall $2)
     ;;
 
   run|start)
@@ -52,16 +59,6 @@ case "$1" in
     send terminate "$i"
     ;;
 
-  stop|pause)
-    i=$2
-    send pause "$i"
-    ;;
-
-  resume|continue)
-    i=$2
-    send resume "$i"
-    ;;
-
   state|status)
     i=$2
     send state "$i"
@@ -75,6 +72,7 @@ The commands are:
 
   list
   runnables      list the runnable widgets installed
+                 option -a or --all for all instances
 
   add wgt
   install wgt    install the wgt file
@@ -87,6 +85,7 @@ The commands are:
 
   ps
   runners        list the running instance
+                 option -a or --all for all instances
 
   run id
   start id       start an instance of the widget of id
@@ -96,12 +95,6 @@ The commands are:
   kill rid
   terminate rid  terminate the running instance rid
 
-  stop rid
-  pause rid      pause the running instance rid
-
-  resume rid
-  continue rid   continue the previously paused rid
-
   status rid
   state rid      get status of the running instance rid