Adjust install step order

Adjust order of steps to match previous Tizen's.

Change-Id: Ia97ca9f69da79375941c20a48982d2a1d8b12966
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 76d0a00..f064f30 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -7,6 +7,7 @@
 #include <common/pkgmgr_interface.h>
 
 #include <common/privileges.h>
+#include <common/step/filesystem/step_create_icons.h>
 #include <common/step/filesystem/step_create_storage_directories.h>
 #include <common/step/filesystem/step_delta_patch.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -63,17 +64,21 @@ void WgtInstaller::InstallSteps() {
       "CheckWgtNotificationCategory");
   AddStepAfter<wgt::encryption::StepEncryptResources>("CheckWgtImePrivilege");
   AddStepAfter<wgt::filesystem::StepWgtResourceDirectory>("EncryptResources");
-  AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("CreateIcons", true);
-  AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
-  AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
+  RemoveStep("CreateIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
+      "CopyTEP");
+  AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>(
+      "WgtPatchStorageDirectories");
+  AddStepAfter<wgt::filesystem::StepWgtPatchIcons>(
+      "CreateWgtSymbolicLink", true);
+  AddStepAfter<ci::filesystem::StepCreateIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("CreateIcons");
   AddStepAfter<wgt::security::StepCheckExtensionPrivileges>(
-      "CreateWgtSymbolicLink");
+      "CopyPreviewIcons");
   AddStepAfter<wgt::pkgmgr::StepGenerateXml>("CheckExtensionPrivileges");
   ReplaceStep<ci::filesystem::StepCreateStorageDirectories>(
       "CreateStorageDirectories",
       wgt::filesystem::WgtAdditionalSharedDirs);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CreateStorageDirectories");
 }
 
 void WgtInstaller::UpdateSteps() {