Add functions to represent package directories

[Issue#]   LINUXWRT-358
[Problem]  Function wasn't invoked due to objective programming standards
[Cause]    N/A
[Solution] Add two new functions in src/misc/widget_location.cpp:
            - getUsrSharePackagesDir
            - getOptSharePackagesDir

Change-Id: Ia38d2982443274ec300e376f5b8c94457e417b9a

diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp
index 03fa597..d907b4b 100644 (file)
--- a/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@ -626,9 +626,9 @@ void TaskManifestFile::stepGenerateManifest()
 
     std::ostringstream destFile;
     if (m_context.mode.rootPath == InstallMode::RootPath::RO) {
-        destFile << "/usr/share/packages" << "/"; //TODO constant with path
+        destFile << WrtDB::GlobalConfig::GetPreloadManifestPath() << "/";
     } else {
-        destFile << "/opt/share/packages" << "/"; //TODO constant with path
+        destFile << WrtDB::GlobalConfig::GetManifestPath() << "/";
     }
 
     destFile << DPL::ToUTF8String(manifest_name);

diff --git a/src/misc/widget_location.cpp b/src/misc/widget_location.cpp
index c4701fb..c43d9fb 100644 (file)
--- a/src/misc/widget_location.cpp
+++ b/src/misc/widget_location.cpp
@@ -283,4 +283,4 @@ std::string WidgetLocation::getBackupSharedDataDir() const
 std::string WidgetLocation::getBackupSharedTrustedDir() const
 {
     return getBackupSharedDir() + "/trusted";
-}
+}
\ No newline at end of file