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

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 3d4befa..b54bb58 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -104,7 +104,7 @@ 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
@@ -148,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
@@ -227,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