X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=b54bb58f62c6f98e10bbd1346b0f32e8be8bf0d2;hb=d1aec4dfa14a272de5925edeb18715a4be377639;hp=64afdb613e7270787edc462f54bfb73347a51fd3;hpb=3f8568f7144055a870e00f99ae9c9c440eb3f2a6;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 64afdb6..b54bb58 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -3,6 +3,7 @@
 set -x
 
 export TERM=dumb
+export COLUMNS=1000
 
 AGLDRIVER=agl-driver
 
@@ -71,9 +72,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
@@ -101,11 +104,11 @@ do
 	fi
 
 	echo "DEBUG: check presence of $WGTNAME"
-	NAMEID=$(grep id\\\":\\\"${WGTNAME}@ $LIST | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep id\\\":\\\"${WGTNAME} $LIST | cut -d\" -f4 | cut -d\\ -f1)
 	if [ ! -z "$NAMEID" ];then
 		echo "DEBUG: $WGTNAME already installed as $NAMEID"
 		# need to kill then deinstall
-		afm-util ps | grep -q $WGTNAME
+		afm-util ps --all | grep -q $WGTNAME
 		if [ $? -eq 0 ];then
 			echo "DEBUG: kill $WGTNAME"
 			afm-util kill $WGTNAME
@@ -145,7 +148,7 @@ do
 		lava-test-case afm-util-install-$WGTNAME --result pass
 	fi
 	# message is like \"added\":\"mediaplayer@0.1\"
-	NAMEID=$(grep d\\\":\\\"${WGTNAME}@ $OUT | cut -d\" -f4 | cut -d\\ -f1)
+	NAMEID=$(grep d\\\":\\\"${WGTNAME} $OUT | cut -d\" -f4 | cut -d\\ -f1)
 	if [ -z "$NAMEID" ];then
 		echo "ERROR: Cannot get nameid"
 		continue
@@ -171,7 +174,7 @@ do
 		echo "DEBUG: end of list"
 	fi
 
-	afm-util info $NAMEID
+	do_afm_util info $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util info"
 		lava-test-case afm-util-info-$WGTNAME --result fail
@@ -201,7 +204,7 @@ do
 
 	echo "DEBUG: Get RID for $NAMEID"
 	PSLIST="pslist"
-	afm-util ps > $PSLIST
+	afm-util ps --all > $PSLIST
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util ps"
 		lava-test-case afm-util-ps-$WGTNAME --result fail
@@ -214,7 +217,7 @@ do
 	RID="$(cat rid)"
 
 	echo "DEBUG: status $NAMEID ($RID)"
-	afm-util status $RID
+	do_afm_util status $RID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util status"
 		lava-test-case afm-util-status-$WGTNAME --result fail
@@ -224,7 +227,7 @@ do
 	fi
 
 	echo "DEBUG: kill $NAMEID ($RID)"
-	afm-util kill $NAMEID
+	do_afm_util kill $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util kill"
 		lava-test-case afm-util-kill-$WGTNAME --result fail