From 9d3abedebb8d8de1ba8343cc3820a02eb40a614a Mon Sep 17 00:00:00 2001
From: ilho kim <ilho159.kim@samsung.com>
Date: Thu, 12 Jan 2023 20:50:33 +0900
Subject: [PATCH] Move StepWgtPatchStorageDirectories in the right order

Change-Id: I15f0d9053f40bf11495665cbc29eac687b7a1e76
Signed-off-by: ilho kim <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 18 ++++++------------
 src/wgt/wgt_installer.cc       | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index d96fa36..99acd08 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -75,6 +75,7 @@ void HybridInstaller::InstallSteps() {
   AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("TpkPatchIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("CopyTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
       "CreateWgtSymbolicLink");
@@ -88,8 +89,6 @@ void HybridInstaller::InstallSteps() {
   ReplaceStep<ci::filesystem::StepCreateStorageDirectories>(
       "CreateStorageDirectories",
       wgt::filesystem::HybridAdditionalSharedDirs);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CreateStorageDirectories");
 }
 
 void HybridInstaller::UpdateSteps() {
@@ -109,6 +108,7 @@ void HybridInstaller::UpdateSteps() {
   AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("TpkPatchIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("UpdateTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
       "CreateWgtSymbolicLink");
@@ -119,8 +119,6 @@ void HybridInstaller::UpdateSteps() {
   AddStepAfter<hybrid::configuration::StepMergeTpkPrivileges>("MergeTpkConfig");
   AddStepAfter<ci::security::StepPrivilegeCompatibility>("MergeTpkPrivileges",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CopyStorageDirectories");
 }
 
 void HybridInstaller::UninstallSteps() {
@@ -158,6 +156,7 @@ void HybridInstaller::DeltaSteps() {
   AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("TpkPatchIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("UpdateTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
       "CreateWgtSymbolicLink");
@@ -168,8 +167,6 @@ void HybridInstaller::DeltaSteps() {
   AddStepAfter<hybrid::configuration::StepMergeTpkPrivileges>("MergeTpkConfig");
   AddStepAfter<ci::security::StepPrivilegeCompatibility>("MergeTpkPrivileges",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CopyStorageDirectories");
 }
 
 void HybridInstaller::RecoverySteps() {
@@ -198,6 +195,7 @@ void HybridInstaller::MountInstallSteps() {
   AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("TpkPatchIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("CopyTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
       "CreateWgtSymbolicLink");
@@ -211,8 +209,6 @@ void HybridInstaller::MountInstallSteps() {
   ReplaceStep<ci::filesystem::StepCreateStorageDirectories>(
       "CreateStorageDirectories",
       wgt::filesystem::HybridAdditionalSharedDirs);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CreateStorageDirectories");
 }
 
 void HybridInstaller::MountUpdateSteps() {
@@ -233,6 +229,7 @@ void HybridInstaller::MountUpdateSteps() {
   AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("TpkPatchIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("UpdateTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
       "CreateWgtSymbolicLink");
@@ -243,8 +240,6 @@ void HybridInstaller::MountUpdateSteps() {
   AddStepAfter<hybrid::configuration::StepMergeTpkPrivileges>("MergeTpkConfig");
   AddStepAfter<ci::security::StepPrivilegeCompatibility>("MergeTpkPrivileges",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "UpdateStorageDirectories");
 }
 
 void HybridInstaller::ManifestDirectInstallSteps() {
@@ -380,6 +375,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStepAfter<tpk::filesystem::StepTpkPatchIcons>("CreateIcons");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("TpkPatchIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("CopyTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<tpk::filesystem::StepCreateTpkSymbolicLink>(
       "CreateWgtSymbolicLink");
@@ -390,8 +386,6 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStepAfter<hybrid::configuration::StepMergeTpkPrivileges>("MergeTpkConfig");
   AddStepAfter<ci::security::StepPrivilegeCompatibility>("MergeTpkPrivileges",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "UpdateStorageDirectories");
 }
 
 void HybridInstaller::ReadonlyUpdateUninstallSteps() {
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index d79b585..82f1e8d 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -74,8 +74,7 @@ void WgtInstaller::InstallSteps() {
   AddStepAfter<wgt::encryption::StepEncryptResources>("CheckWgtImePrivilege");
   AddStepAfter<wgt::filesystem::StepWgtResourceDirectory>("EncryptResources");
   RemoveStep("CreateIcons");
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CopyTep");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("CopyTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>(
       "WgtPatchStorageDirectories");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>(
@@ -107,12 +106,11 @@ void WgtInstaller::UpdateSteps() {
   AddStepAfter<wgt::filesystem::StepWgtResourceDirectory>("EncryptResources");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("CreateIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("UpdateTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<wgt::security::StepCheckExtensionPrivileges>(
       "CreateWgtSymbolicLink");
   AddStepAfter<wgt::pkgmgr::StepGenerateXml>("CheckExtensionPrivileges");
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CopyStorageDirectories");
 }
 
 void WgtInstaller::UninstallSteps() {
@@ -159,12 +157,11 @@ void WgtInstaller::DeltaSteps() {
   AddStepAfter<wgt::filesystem::StepWgtResourceDirectory>("EncryptResources");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("CreateIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("UpdateTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>("CopyPreviewIcons");
   AddStepAfter<wgt::security::StepCheckExtensionPrivileges>(
       "CreateWgtSymbolicLink");
   AddStepAfter<wgt::pkgmgr::StepGenerateXml>("CheckExtensionPrivileges");
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CopyStorageDirectories");
 }
 
 void WgtInstaller::RecoverySteps() {
@@ -192,6 +189,7 @@ void WgtInstaller::MountInstallSteps() {
   AddStepAfter<wgt::filesystem::StepWgtPreparePackageDirectory>("MountInstall");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("CreateIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("CopyTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>(
       "CopyPreviewIcons");
   AddStepAfter<wgt::security::StepCheckExtensionPrivileges>(
@@ -200,8 +198,6 @@ void WgtInstaller::MountInstallSteps() {
   ReplaceStep<ci::filesystem::StepCreateStorageDirectories>(
       "CreateStorageDirectories",
       wgt::filesystem::WgtAdditionalSharedDirs);
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CreateStorageDirectories");
 }
 
 void WgtInstaller::MountUpdateSteps() {
@@ -221,13 +217,12 @@ void WgtInstaller::MountUpdateSteps() {
   AddStepAfter<wgt::filesystem::StepWgtUpdatePackageDirectory>("MountUpdate");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("CreateIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("UpdateTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>(
       "CopyPreviewIcons");
   AddStepAfter<wgt::security::StepCheckExtensionPrivileges>(
       "CreateWgtSymbolicLink");
   AddStepAfter<wgt::pkgmgr::StepGenerateXml>("CheckExtensionPrivileges");
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "UpdateStorageDirectories");
 }
 
 void WgtInstaller::ManifestDirectInstallSteps() {
@@ -294,13 +289,12 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
   AddStepAfter<wgt::filesystem::StepWgtResourceDirectory>("EncryptResources");
   AddStepAfter<wgt::filesystem::StepWgtPatchIcons>("CreateIcons", true);
   AddStepAfter<wgt::filesystem::StepCopyPreviewIcons>("WgtPatchIcons");
+  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>("CopyTep");
   AddStepAfter<wgt::filesystem::StepCreateWgtSymbolicLink>(
       "CopyPreviewIcons");
   AddStepAfter<wgt::security::StepCheckExtensionPrivileges>(
       "CreateWgtSymbolicLink");
   AddStepAfter<wgt::pkgmgr::StepGenerateXml>("CheckExtensionPrivileges");
-  AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "UpdateStorageDirectories");
 }
 
 void WgtInstaller::ReadonlyUpdateUninstallSteps() {
-- 
2.7.4