X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=0bc7f08c3e7cb2e65e1ad3ac0ba8812e29d2934d;hb=225cd026b8baea8e38b29187309e734ea373288f;hp=15d505cb2ced925cf94b46a7c9a493649959362a;hpb=083006b12a5fb4938e1ce74875824238b0e90661;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 15d505c..0bc7f08 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -3,10 +3,8 @@
 set -x
 
 export TERM=dumb
+export COLUMNS=1000
 
-SERVICE_PLATFORM=0
-SERVICE_USER=0
-APPLICATION_USER=0
 AGLDRIVER=agl-driver
 
 while [ $# -ge 1 ]
@@ -30,6 +28,16 @@ if [ -z "$BASEURL" ]; then
 	exit 1
 fi
 
+do_afm_util()
+{
+	if [ $SERVICE_USER -eq 1 -o $APPLICATION_USER -eq 1 ];then
+		su - $AGLDRIVER -c "afm-util $*"
+	else
+		afm-util $*
+	fi
+	return $?
+}
+
 wget -q $BASEURL -O index.html
 if [ $? -ne 0 ];then
 	echo "ERROR: Cannot wget $BASEURL"
@@ -40,6 +48,9 @@ grep -o '[a-z-]*.wgt' index.html | sort | uniq |
 while read wgtfile
 do
 	WGTNAME=$(echo $wgtfile | sed 's,.wgt$,,')
+	SERVICE_PLATFORM=0
+	SERVICE_USER=0
+	APPLICATION_USER=0
 	echo "DEBUG: fetch $wgtfile"
 	wget -q $BASEURL/$wgtfile
 	if [ $? -ne 0 ];then
@@ -49,7 +60,11 @@ do
 
 	echo "DEBUG: analyse wgt file"
 	unzip $wgtfile
-	if [ $? -eq 0 ];then
+	if [ $? -ne 0 ];then
+		# TODO Do not fail yet, busybox unzip seems to "fail with success" when checking CRC
+		echo "ERROR: cannot unzip $wgtfile"
+	fi
+	if [ -f config.xml ];then
 		grep hidden config.xml
 		if [ $? -eq 0 ];then
 			echo "DEBUG: hidden package"
@@ -57,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
@@ -91,7 +108,7 @@ do
 	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
@@ -157,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
@@ -170,24 +187,8 @@ do
 	echo "DEBUG: check if we see the package with systemctl -a (before start)"
 	systemctl -a |grep "afm.*$WGTNAME"
 
-	# here we need to differ between SERVICE_PLATFORM, SERVICE_USER and APPLICATION_USER
-	if test x"1" = x"$SERVICE_PLATFORM" ; then
-	    PRE_CMD="su -c"
-	fi
-	if test x"1" = x"$SERVICE_USER" ; then
-	    PRE_CMD="su $AGLDRIVER -c"
-	fi
-	if test x"1" = x"$APPLICATION_USER" ; then
-	    PRE_CMD="su $AGLDRIVER -c"
-	fi
-
-	# construct the command to call
-	CMD=( "$PRE_CMD" )
-	CMD+=( " ' " )
-	CMD+=( "afm-util start $NAMEID" )
-	CMD+=( " ' " )
 	echo "DEBUG: start $NAMEID"
-	exec "${CMD[@]}"  > "rid"
+	do_afm_util start $NAMEID > "rid"
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util start"
 		lava-test-case afm-util-start-$WGTNAME --result fail
@@ -203,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
@@ -216,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
@@ -226,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
@@ -236,7 +237,7 @@ do
 	fi
 
 	echo "DEBUG: start2 $NAMEID"
-	exec "${CMD[@]}"
+	do_afm_util start $NAMEID
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util start2"
 		lava-test-case afm-util-start2-$WGTNAME --result fail