From b2aeb1481c33afe8332d5df493bbb1dd5bf88afa Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Mon, 15 Jan 2018 19:50:14 +0900
Subject: [PATCH] Fix ManifestDirectInstall for mount installed pkg

- Add additional step to determine whether pkg is
  mount installed or not.
- Signature files will be extracted.

Related changes:
[app-installers] : https://review.tizen.org/gerrit/#/c/167144/

Change-Id: Iac19c7391265657c8b812a9424c9234dc58df179
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/tpk/tpk_installer.cc  |  3 +++
 src/tpk/tpk_mount_path.cc | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index 5ca6fac..aa5b111 100644
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -48,6 +48,7 @@
 #include <common/step/filesystem/step_remove_zip_image.h>
 #include <common/step/filesystem/step_unzip.h>
 #include <common/step/filesystem/step_update_tep.h>
+#include <common/step/mount/step_check_mount_path.h>
 #include <common/step/mount/step_mount_unpacked.h>
 #include <common/step/mount/step_mount_install.h>
 #include <common/step/mount/step_mount_recover.h>
@@ -458,6 +459,7 @@ void TpkInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::pkgmgr::StepCheckInstallable>();
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<tpk::filesystem::StepCheckPkgDirPath>();
+  AddStep<ci::mount::StepCheckMountPath>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
@@ -489,6 +491,7 @@ void TpkInstaller::ManifestDirectUpdateSteps() {
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::configuration::StepParsePreload>();
+  AddStep<ci::mount::StepCheckMountPath>();
   AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepCheckSignature>();
diff --git a/src/tpk/tpk_mount_path.cc b/src/tpk/tpk_mount_path.cc
index 947dd5e..ab92715 100644
--- a/src/tpk/tpk_mount_path.cc
+++ b/src/tpk/tpk_mount_path.cc
@@ -12,15 +12,15 @@ namespace {
 const std::vector<std::string> kExtractEntries = {
   "bin",
   "lib",
-  "shared/res"
+  "shared/res",
+  "author-signature.xml",
+  "signature1.xml",
+  "signature2.xml"
 };
 
 const std::vector<std::string> kSymlinkEntries = {
   "res",
-  "tizen-manifest.xml",
-  "author-signature.xml",
-  "signature1.xml",
-  "signature2.xml"
+  "tizen-manifest.xml"
 };
 
 }  // namespace
-- 
2.7.4