[Release] wrt-installer_0.1.85

[platform/framework/web/wrt-installer.git] / src / jobs / widget_install / task_file_manipulation.cpp

diff --git a/src/jobs/widget_install/task_file_manipulation.cpp b/src/jobs/widget_install/task_file_manipulation.cpp
index fa229cd..181e85e 100644 (file)
--- a/src/jobs/widget_install/task_file_manipulation.cpp
+++ b/src/jobs/widget_install/task_file_manipulation.cpp
@@ -150,8 +150,7 @@ TaskFileManipulation::TaskFileManipulation(InstallerContext& context) :
             m_context.locationType)
     {
         AddStep(&TaskFileManipulation::StepCreateDirs);
-        if (m_context.widgetConfig.packagingType !=
-            WrtDB::PKG_TYPE_DIRECTORY_WEB_APP)
+        if (m_context.mode.extension != InstallMode::ExtensionType::DIR)
         {
             AddStep(&TaskFileManipulation::StepRenamePath);
             AddAbortStep(&TaskFileManipulation::StepAbortRenamePath);
@@ -206,17 +205,17 @@ void TaskFileManipulation::StepCreatePrivateStorageDir()
     LogDebug("Create private storage directory : " <<
             m_context.locations->getPrivateStorageDir());
 
+    changeOwnerForDirectory(storagePath, PRIVATE_STORAGE_MODE);
+
     if (m_context.isUpdateMode) { //update
         std::string backData = m_context.locations->getBackupPrivateDir();
         LogDebug("copy private storage " << backData << " to " << storagePath);
-        WrtUtilMakeDir(storagePath);
         if (!DirectoryApi::DirectoryCopy(backData, storagePath)) {
             LogError("Failed to rename " << backData << " to " << storagePath);
             ThrowMsg(Exceptions::BackupFailed,
                     "Error occurs copy private strage files");
         }
     }
-    changeOwnerForDirectory(storagePath, PRIVATE_STORAGE_MODE);
 
     std::string tempStoragePath = m_context.locations->getPrivateTempStorageDir();
     LogDebug("Create temp private storage directory : " << tempStoragePath);
@@ -253,17 +252,16 @@ void TaskFileManipulation::StepRenamePath()
 void TaskFileManipulation::StepLinkForPreload()
 {
     if (m_context.mode.rootPath == InstallMode::RootPath::RO) {
-        std::string srcDir = m_context.locations->getUserDataRootDir() +
-            WrtDB::GlobalConfig::GetWidgetSrcPath();
+        std::string optRes = m_context.locations->getUserDataRootDir() +
+            WrtDB::GlobalConfig::GetWidgetResPath();
+        std::string usrRes = m_context.locations->getPackageInstallationDir() +
+            WrtDB::GlobalConfig::GetWidgetResPath();
 
-        if (0 != access(srcDir.c_str(), F_OK)) {
+        if (0 != access(optRes.c_str(), F_OK)) {
             LogDebug("Make symbolic name for preaload app" <<
-                    m_context.locations->getSourceDir() << " to " << srcDir);
-            std::string resDir = m_context.locations->getUserDataRootDir() +
-                "/res";
+                    usrRes << " to " << optRes);
 
-            WrtUtilMakeDir(resDir);
-            if (symlink(m_context.locations->getSourceDir().c_str(), srcDir.c_str()) != 0)
+            if (symlink(usrRes.c_str(), optRes.c_str()) != 0)
             {
                 int error = errno;
                 if (error)
@@ -317,22 +315,18 @@ void TaskFileManipulation::StepAbortRenamePath()
 {
     LogDebug("[Rename Widget Path] Aborting.... (Rename path)");
     std::string widgetPath;
-    if (m_context.widgetConfig.packagingType != PKG_TYPE_HYBRID_WEB_APP) {
-        widgetPath = m_context.locations->getPackageInstallationDir();
-        if (!WrtUtilRemove(widgetPath)) {
-            ThrowMsg(Exceptions::RemovingFolderFailure,
-                     "Error occurs during removing existing folder");
-        }
-        // Remove user data directory if preload web app.
-        std::string userData = m_context.locations->getUserDataRootDir();
-        if (0 == access(userData.c_str(), F_OK)) {
-            if (!WrtUtilRemove(userData)) {
-                ThrowMsg(Exceptions::RemovingFolderFailure,
-                         "Error occurs during removing user data directory");
-            }
+    widgetPath = m_context.locations->getPackageInstallationDir();
+    if (!WrtUtilRemove(widgetPath)) {
+        LogError("Error occurs during removing existing folder");
+    }
+    // Remove user data directory if preload web app.
+    std::string userData = m_context.locations->getUserDataRootDir();
+    if (0 == access(userData.c_str(), F_OK)) {
+        if (!WrtUtilRemove(userData)) {
+            LogError("Error occurs during removing user data directory");
         }
-
     }
+
     LogDebug("Rename widget path sucessful!");
 }