From 4d8b0f4845ff867b1b94161d1f6da5b392d97741 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Thu, 8 Sep 2016 16:07:32 +0900
Subject: [PATCH] add and fix step for fota and direct install

- Add StepWgtPatchIcons at ManifestDirectInstall and Update to work it properly
- Fix StepWgtPatchIcons to overwrite icon even exists

Related changes
[pkgmgr-tool] : https://review.tizen.org/gerrit/#/c/83327/
[app-installers] : https://review.tizen.org/gerrit/#/c/86789/
[tpk-backend] : https://review.tizen.org/gerrit/#/c/86846/

Change-Id: I9a13d6af490832e0a48fd8e837a7bc29aeb60648
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/wgt/step/filesystem/step_wgt_patch_icons.cc | 2 +-
 src/wgt/wgt_installer.cc                        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/wgt/step/filesystem/step_wgt_patch_icons.cc b/src/wgt/step/filesystem/step_wgt_patch_icons.cc
index 01b62fd..c01c1c8 100644
--- a/src/wgt/step/filesystem/step_wgt_patch_icons.cc
+++ b/src/wgt/step/filesystem/step_wgt_patch_icons.cc
@@ -60,7 +60,7 @@ common_installer::Step::Status StepWgtPatchIcons::process() {
       // create default icon if there is no icon at all
       bf::path icon_path = common_icon_location / app->appid;
       icon_path += ".png";
-      bf::copy_file(kDefaultIconPath, icon_path, error);
+      bf::copy_file(kDefaultIconPath, icon_path, bf::copy_option::overwrite_if_exists, error);
       if (error) {
         LOG(ERROR) << "Failed to create default icon for web application";
         return Status::ICON_ERROR;
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index d137fab..59cfa91 100755
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -395,6 +395,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
       AddStep<ci::security::StepRollbackInstallationSecurity>();
       AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
+      AddStep<wgt::filesystem::StepWgtPatchIcons>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<ci::pkgmgr::StepRegisterApplication>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
@@ -422,6 +423,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepCopyTep>();
       AddStep<ci::security::StepUpdateSecurity>();
       AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
+      AddStep<wgt::filesystem::StepWgtPatchIcons>();
       AddStep<wgt::pkgmgr::StepGenerateXml>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
-- 
2.7.4