Add multi-user support.

Bug-Tizen: PTREL-326
Change-Id: I32f7eb47038da59972896a007c7247bdc55e4ba5
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6326fa..0b2900c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
 INCLUDE(FindPkgConfig)
 
 SET(APPSVC_PKGS_CHECK_MODULES "dlog ecore libprivilege-control aul")
-SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 ecore libsoup-2.4 iniparser pkgmgr-info")
+SET(APPSVC_LIBPKGS_CHECK_MODULES "dlog bundle dbus-glib-1 ail xdgmime aul glib-2.0 ecore libsoup-2.4 iniparser pkgmgr-info libtzplatform-config")
 
 IF (with_x)
 pkg_check_modules(pkgs REQUIRED ${APPSVC_PKGS_CHECK_MODULES} x11)

diff --git a/debian/libappsvc-0.postinst b/debian/libappsvc-0.postinst
index 31e162c..a577896 100755 (executable)
--- a/debian/libappsvc-0.postinst
+++ b/debian/libappsvc-0.postinst
@@ -1,18 +1,19 @@
 #!/bin/sh
+source /etc/tizen-platform.conf
 
-mkdir -p /opt/dbspace
-sqlite3 /opt/dbspace/.appsvc.db < /opt/share/appsvc_db.sql
+mkdir -p $TZ_SYS_DB
+sqlite3 $TZ_SYS_DB/.appsvc.db < $TZ_SYS_SHARE/appsvc_db.sql
 rm -rf /opt/share/appsvc_db.sql
 
 if [ "${USER}" = "root" ]
 then
        chown root:root /usr/lib/libappsvc.so.0.1.0
-       chown root:5000 /opt/dbspace/.appsvc.db
-       chown root:5000 /opt/dbspace/.appsvc.db-journal
+       chown root:$TZ_SYS_USER_GROUP $TZ_SYS_DB/.appsvc.db
+       chown root:$TZ_SYS_USER_GROUP $TZ_SYS_DB/.appsvc.db-journal
 fi
 
 chmod 644 /usr/lib/libappsvc.so.0.1.0
-chmod 664 /opt/dbspace/.appsvc.db
-chmod 664 /opt/dbspace/.appsvc.db-journal
+chmod 664 $TZ_SYS_DB/.appsvc.db
+chmod 664 $TZ_SYS_DB/.appsvc.db-journal
 
 #chmod 1777 /opt/share/miregex # Set directory to be writable for other accounts

diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec
index 57bb777..258d451 100644 (file)
--- a/packaging/app-svc.spec
+++ b/packaging/app-svc.spec
@@ -30,6 +30,7 @@ BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libsoup-2.4)
 BuildRequires: pkgconfig(iniparser)
 BuildRequires: pkgconfig(pkgmgr-info)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 
 %description
@@ -60,8 +61,8 @@ make %{?jobs:-j%jobs}
 %make_install
 
 # Create database
-mkdir -p %{buildroot}/opt/dbspace
-sqlite3 %{buildroot}/opt/dbspace/.appsvc.db < data/appsvc_db.sql
+mkdir -p %{buildroot}%{TZ_SYS_DB}
+sqlite3 %{buildroot}%{TZ_SYS_DB}/.appsvc.db < data/appsvc_db.sql
 
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
@@ -74,8 +75,8 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
 %license LICENSE
-%config(noreplace) %verify(not md5 mtime size) %attr(664,root,app) /opt/dbspace/.appsvc.db
-%config(noreplace) %verify(not md5 mtime size) %attr(664,root,app) /opt/dbspace/.appsvc.db-journal
+%config(noreplace) %verify(not md5 mtime size) %attr(664,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.appsvc.db
+%config(noreplace) %verify(not md5 mtime size) %attr(664,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.appsvc.db-journal
 /usr/bin/appsvc_test
 %{_libdir}/libappsvc.so.0
 %{_libdir}/libappsvc.so.0.1.0

diff --git a/src/appsvc_db.c b/src/appsvc_db.c
index 4cc184b..08fd5bd 100755 (executable)
--- a/src/appsvc_db.c
+++ b/src/appsvc_db.c
@@ -24,13 +24,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
+#include <tzplatform_config.h>
 
 #include "appsvc_db.h"
 #include "internal.h"
 
-
-#define SVC_DB_PATH    "/opt/dbspace/.appsvc.db"
-#define APP_INFO_DB_PATH       "/opt/dbspace/.app_info.db"
+#define SVC_DB_PATH    tzplatform_mkpath(TZ_SYS_DB, ".appsvc.db")
+#define APP_INFO_DB_PATH       tzplatform_mkpath(TZ_SYS_DB, ".app_info.db")
 
 #define QUERY_MAX_LEN  8192
 #define URI_MAX_LEN    4096