summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-10-21 16:00:34 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-10-21 14:19:54 +0000
commit3f8568f7144055a870e00f99ae9c9c440eb3f2a6 (patch)
treeed4dee85554dccc46facb082d31c495480609d9d /common
parentba2a97f4acb44194cc2a827e344d71f916d432b8 (diff)
SPEC-2903: Use a wrapper instead of constructing a command
This patch change the way we ran afm-util commands by using a simple wrapper. Furthermore, since we are in a loop, let's reset all variable (SERVICE_PLATFORM/etc..) to 0 at the beginning of the loop. Extra-furthermore: restore the unzip error code test, but in non-fatal way, since busybox unzip seems to dont like our CRC. Bug-AGL: SPEC-2903 Change-Id: I5d7357fd74307ed69a6675beac57d8601fdcdb52 Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
Diffstat (limited to 'common')
-rwxr-xr-xcommon/scripts/application-lifecycle.sh42
1 files changed, 19 insertions, 23 deletions
diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 83ca340..64afdb6 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -4,9 +4,6 @@ set -x
export TERM=dumb
-SERVICE_PLATFORM=0
-SERVICE_USER=0
-APPLICATION_USER=0
AGLDRIVER=agl-driver
while [ $# -ge 1 ]
@@ -30,6 +27,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 +47,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,6 +59,10 @@ do
echo "DEBUG: analyse wgt file"
unzip $wgtfile
+ 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
@@ -170,26 +184,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 ' "
- POST_CMD=" '"
- fi
- if test x"1" = x"$SERVICE_USER" ; then
- PRE_CMD="su $AGLDRIVER -c '"
- POST_CMD=" '"
- fi
- if test x"1" = x"$APPLICATION_USER" ; then
- PRE_CMD="su $AGLDRIVER -c '"
- POST_CMD=" '"
- fi
-
- # construct the command to call
- CMD=( "$PRE_CMD" )
- CMD+=( "afm-util start $NAMEID" )
- CMD+=( "$POST_CMD" )
echo "DEBUG: start $NAMEID"
- ${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
@@ -238,7 +234,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