SPEC-2903: fix the grep test method 48/22748/1
authorCorentin LABBE <clabbe@baylibre.com>
Tue, 22 Oct 2019 12:11:15 +0000 (14:11 +0200)
committerCorentin LABBE <clabbe@baylibre.com>
Tue, 22 Oct 2019 12:20:04 +0000 (14:20 +0200)
While inspecting if application test is working with our latest
SPEC-2903 changes I see in job 8845 the following errors:
+ grep urn:AGL:widget:provided-api config.xml
+ '<feature' 'name=\"urn:AGL:widget:provided-api\">'
./common/scripts/application-lifecycle.sh: line 74: <feature: command not found

So let's change the grep method.
Furthermore, add a debug for the do_afm_util for being sure it work as
needed.

Bug-AGL: SPEC-2903
Change-Id: I5a8a6d98cd9dc6c1b2d1626fc6841eb2c2b16d53
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
common/scripts/application-lifecycle.sh

index 64afdb6..551e5b6 100755 (executable)
@@ -30,8 +30,10 @@ fi
 do_afm_util()
 {
        if [ $SERVICE_USER -eq 1 -o $APPLICATION_USER -eq 1 ];then
+               echo "DEBUG: do_afm_util as $AGLDRIVER"
                su - $AGLDRIVER -c "afm-util $*"
        else
+               echo "DEBUG: do_afm_util as $(whoami)"
                afm-util $*
        fi
        return $?
@@ -71,9 +73,11 @@ do
                        echo "DEBUG: not hidden package"
                fi
                # a service sets urn:AGL:widget:provided-api
-               if $(grep "urn:AGL:widget:provided-api" config.xml) ; then
+               grep "urn:AGL:widget:provided-api" config.xml
+               if [ $? -eq 0 ] ; then
                    # we are a service, now determine the scope ...
-                   if $(grep "urn:AGL:permission::partner:scope-platform" config.xml) ; then
+                   grep "urn:AGL:permission::partner:scope-platform" config.xml
+                   if [ $? -eq 0 ];then
                        SERVICE_PLATFORM=1
                    else
                        SERVICE_USER=1