From: Jiwoong Im Date: Fri, 11 Nov 2016 06:30:47 +0000 (+0900) Subject: [TCT][inst.sh][Non-ACR][modify globalapp install command in install script] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28d7432f11ae4f1f5be79d2cd422215141c1e263;p=test%2Ftct%2Fnative%2Fapi.git [TCT][inst.sh][Non-ACR][modify globalapp install command in install script] Change-Id: I269fc658322f69f72226db74319bdad13065ff8e Signed-off-by: Jiwoong Im --- diff --git a/scripts_tpk/inst.sh b/scripts_tpk/inst.sh index d4ddedf..339a79d 100755 --- a/scripts_tpk/inst.sh +++ b/scripts_tpk/inst.sh @@ -26,7 +26,8 @@ PKG_FULLNAME=%{PKG_FULLNAME} # name supplied by external script APP_DIR=/usr/apps - + ADMIN_USER=owner + #parse params USAGE="Usage: ./inst.sh [-i] [-u] -i install wgt and config environment @@ -152,7 +153,8 @@ fi for app in $applist do if [[ "$app" == "org.tizen.globalapp"* ]]; then - su -c "pkgcmd --global -iqt tpk -p $DEVICE_SUITE_TARGET_30/res/$app > /dev/null" $DEVICE_EXECUTION_MODE_30 + cp $DEVICE_SUITE_TARGET_30/res/$app /tmp/ + su -c "pkgcmd --global -iqt tpk -p /tmp/$app > /dev/null" $ADMIN_USER else su -c "pkgcmd -iqt tpk -p $DEVICE_SUITE_TARGET_30/res/$app > /dev/null" $DEVICE_EXECUTION_MODE_30 fi @@ -205,7 +207,7 @@ fi for app in $applist do if [ "$app" == "org.tizen.globalapp" ]; then - su -c "pkgcmd --global -u -n $app > /dev/null" $DEVICE_EXECUTION_MODE_30 + su -c "pkgcmd --global -u -n $app > /dev/null" $ADMIN_USER else su -c "pkgcmd -u -n $app > /dev/null" $DEVICE_EXECUTION_MODE_30 fi diff --git a/templates/tct-package-asan/inst.sh b/templates/tct-package-asan/inst.sh index 3e74be7..135c737 100755 --- a/templates/tct-package-asan/inst.sh +++ b/templates/tct-package-asan/inst.sh @@ -21,6 +21,7 @@ BUILD_TYPE=%{BUILD_TYPE} # directory supplied by external script PKG_NAME=%{PKG_NAME} # name supplied by external script PKG_FULLNAME=%{PKG_FULLNAME} # name supplied by external script APP_DIR=/usr/apps +ADMIN_USER=owner #parse params USAGE="Usage: ./inst.sh [-i] [-u] @@ -153,7 +154,8 @@ function installpkg(){ for app in $applist do if [[ "$app" == "org.tizen.globalapp"* ]]; then - su -c "pkgcmd --global -iqt tpk -p $DEVICE_SUITE_TARGET_30/res/$app > /dev/null" $DEVICE_EXECUTION_MODE_30 + cp $DEVICE_SUITE_TARGET_30/res/$app /tmp/ + su -c "pkgcmd --global -iqt tpk -p /tmp/$app > /dev/null" $ADMIN_USER else su -c "pkgcmd -iqt tpk -p $DEVICE_SUITE_TARGET_30/res/$app > /dev/null" $DEVICE_EXECUTION_MODE_30 fi @@ -206,7 +208,7 @@ fi for app in $applist do if [ "$app" == "org.tizen.globalapp" ]; then - su -c "pkgcmd --global -u -n $app > /dev/null" $DEVICE_EXECUTION_MODE_30 + su -c "pkgcmd --global -u -n $app > /dev/null" $ADMIN_USER else su -c "pkgcmd -u -n $app > /dev/null" $DEVICE_EXECUTION_MODE_30 fi diff --git a/templates/tct-package/inst.sh b/templates/tct-package/inst.sh index 9c8c548..2ed89ae 100755 --- a/templates/tct-package/inst.sh +++ b/templates/tct-package/inst.sh @@ -21,6 +21,7 @@ BUILD_TYPE=%{BUILD_TYPE} # directory supplied by external script PKG_NAME=%{PKG_NAME} # name supplied by external script PKG_FULLNAME=%{PKG_FULLNAME} # name supplied by external script APP_DIR=/usr/apps +ADMIN_USER=owner #parse params USAGE="Usage: ./inst.sh [-i] [-u] @@ -140,7 +141,8 @@ function installpkg(){ for app in $applist do if [[ "$app" == "org.tizen.globalapp"* ]]; then - su -c "pkgcmd --global -iqt tpk -p $DEVICE_SUITE_TARGET_30/res/$app > /dev/null" $DEVICE_EXECUTION_MODE_30 + cp $DEVICE_SUITE_TARGET_30/res/$app /tmp/ + su -c "pkgcmd --global -iqt tpk -p /tmp/$app > /dev/null" $ADMIN_USER else su -c "pkgcmd -iqt tpk -p $DEVICE_SUITE_TARGET_30/res/$app > /dev/null" $DEVICE_EXECUTION_MODE_30 fi @@ -197,7 +199,7 @@ fi for app in $applist do if [ "$app" == "org.tizen.globalapp" ]; then - su -c "pkgcmd --global -u -n $app > /dev/null" $DEVICE_EXECUTION_MODE_30 + su -c "pkgcmd --global -u -n $app > /dev/null" $ADMIN_USER else su -c "pkgcmd -u -n $app > /dev/null" $DEVICE_EXECUTION_MODE_30 fi