SPEC-3533: unzip wgt files in a dedicated directory

[src/qa-testdefinitions.git] / common / scripts / application-lifecycle.sh

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index d28709a..0935fd2 100755 (executable)
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -64,9 +64,12 @@ do
                        continue
                fi
        fi
+       CURDIR="$(pwd)"
+       ZIPOUT="$(mktemp -d)"
+       cd $ZIPOUT
 
        echo "DEBUG: analyse wgt file"
-       unzip $wgtfile
+       unzip $CURDIR/$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"
@@ -97,6 +100,9 @@ do
                echo "DEBUG: fail to unzip"
        fi
 
+       cd $CURDIR
+       rm -r $ZIPOUT
+
        echo "DEBUG: list current pkgs"
        # TODO mktemp
        LIST='list'
@@ -194,9 +200,9 @@ do
        fi
 
        echo "DEBUG: check if we see the package with systemctl list-units (before start)"
-       systemctl list-units --full | grep "afm.*$WGTNAME"
+       systemctl list-units --full | grep "afm.*$WGTNAME--"
        echo "DEBUG: check if we see the package with systemctl -a (before start)"
-       systemctl -a |grep "afm.*$WGTNAME"
+       systemctl -a |grep "afm.*$WGTNAME--"
 
        echo "DEBUG: start $NAMEID"
        do_afm_util start $NAMEID > "rid"
@@ -209,9 +215,9 @@ do
        fi
 
        echo "DEBUG: check if we see the package with systemctl list-units (after start)"
-       systemctl list-units --full | grep "afm.*$WGTNAME"
+       systemctl list-units --full | grep "afm.*$WGTNAME--"
        echo "DEBUG: check if we see the package with systemctl -a (after start)"
-       systemctl -a |grep "afm.*$WGTNAME"
+       systemctl -a |grep "afm.*$WGTNAME--"
 
        echo "DEBUG: Get RID for $NAMEID"
        PSLIST="pslist"