Use datadir variable for file path

Change-Id: I75553ecfd3478ebb40f5d44b47c1c1dfd0d92a71

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d964ea1..860777b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db.sql DESTINATION ${DATAROOTDI
 INSTALL(FILES ${RES_DIR}/dnet_db_init.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/apns-conf.xml DESTINATION ${DATAROOTDIR}/ps-plugin)
 INSTALL(TARGETS ps-plugin LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-packetservice)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ${DATAROOTDIR}/license RENAME tel-plugin-packetservice)
 
 IF (TIZEN_ENGINEER_MODE)
 #  ADD_SUBDIRECTORY(test_src)

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 96cbe1a..3122928 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -54,16 +54,16 @@ mkdir -p %TZ_SYS_DB
 
 if [ ! -f %TZ_SYS_DB/.dnet.db ]
 then
-  sqlite3 %TZ_SYS_DB/.dnet.db < /usr/share/ps-plugin/dnet_db.sql
-  sqlite3 %TZ_SYS_DB/.dnet.db < /usr/share/ps-plugin/dnet_db_init.sql
+  sqlite3 %TZ_SYS_DB/.dnet.db < %{_datadir}/ps-plugin/dnet_db.sql
+  sqlite3 %TZ_SYS_DB/.dnet.db < %{_datadir}/ps-plugin/dnet_db_init.sql
 fi
 if [ ! -f %TZ_SYS_DB/.dnet2.db ]
 then
-  sqlite3 %TZ_SYS_DB/.dnet2.db < /usr/share/ps-plugin/dnet_db.sql
-  sqlite3 %TZ_SYS_DB/.dnet2.db < /usr/share/ps-plugin/dnet_db_init.sql
+  sqlite3 %TZ_SYS_DB/.dnet2.db < %{_datadir}/ps-plugin/dnet_db.sql
+  sqlite3 %TZ_SYS_DB/.dnet2.db < %{_datadir}/ps-plugin/dnet_db_init.sql
 fi
 
-rm -f /usr/share/ps-plugin/dnet_db.sql
+rm -f %{_datadir}/ps-plugin/dnet_db.sql
 
 #change file permission
 if [ -f %TZ_SYS_DB/.dnet.db ]

diff --git a/src/ps_modem.c b/src/ps_modem.c
index 3a9b107..152a937 100644 (file)
--- a/src/ps_modem.c
+++ b/src/ps_modem.c
@@ -23,6 +23,7 @@
 #include "ps_common.h"
 #include "generated-code.h"
 
+#include <tzplatform_config.h>
 #include <server.h>
 #include <plugin.h>
 #include <user_request.h>
@@ -32,6 +33,8 @@
 
 #define PROP_DEFAULT   FALSE
 #define PROP_DEFAULT_STR   NULL
+#define DATABASE_PATH_0        tzplatform_mkpath(TZ_SYS_DB, ".dnet.db")
+#define DATABASE_PATH_1        tzplatform_mkpath(TZ_SYS_DB, ".dnet2.db")
 
 struct ps_thread_data {
        ps_modem_t *modem;
@@ -93,6 +96,7 @@ static gpointer __ps_modem_regenerate_database(gpointer data)
        gboolean rv = FALSE;
        ps_modem_t *modem = data;
        struct ps_thread_data *thread_data = NULL;
+       gchar *command = NULL;
 
        thread_data = g_try_malloc0(sizeof(*thread_data));
        if (!thread_data) {
@@ -105,15 +109,18 @@ static gpointer __ps_modem_regenerate_database(gpointer data)
        _ps_context_reset_profile_table(modem->cp_name);
        /* Re-generate global APN database */
        if (g_str_has_suffix(modem->cp_name, "1"))
-               rv = ps_util_system_command("/usr/bin/sqlite3 /opt/dbspace/.dnet2.db < /usr/share/ps-plugin/dnet_db_init.sql");
+               command = g_strdup_printf("/usr/bin/sqlite3 %s < /usr/share/ps-plugin/dnet_db_init.sql", DATABASE_PATH_1);
        else
-               rv = ps_util_system_command("/usr/bin/sqlite3 /opt/dbspace/.dnet.db < /usr/share/ps-plugin/dnet_db_init.sql");
+               command = g_strdup_printf("/usr/bin/sqlite3 %s < /usr/share/ps-plugin/dnet_db_init.sql", DATABASE_PATH_0);
+       rv = ps_util_system_command(command);
        ps_dbg_ex_co(modem->co_modem, "system command sent, rv(%d)", rv);
        rv = _ps_context_fill_profile_table_from_ini_file(modem->cp_name);
 
        if (TRUE == ps_util_thread_dispatch(g_main_context_default(), G_PRIORITY_LOW, (GSourceFunc)__ps_modem_thread_finish_cb, thread_data))
                dbg("Thread %p processing is complete", thread_data->selfi);
 
+       g_free(command);
+
        return NULL;
 }
 

diff --git a/test_src/main.c b/test_src/main.c
index c2b52bc..cd3a94e 100644 (file)
--- a/test_src/main.c
+++ b/test_src/main.c
@@ -931,6 +931,7 @@ EXIT:
 int main(int arg, char **argv)
 {
        int rv;
+       gchar *command = NULL;
        __init_global_apns_from_xml("/usr/share/ps-plugin/apns-conf.xml");
        rv = __system_command("/bin/mkdir /opt/usr/share/telephony");
        msg("system command sent, rv(%d)", rv);
@@ -938,8 +939,10 @@ int main(int arg, char **argv)
        rv = __system_command("/bin/rm /opt/usr/share/telephony/dnet_db_init.sql");
        msg("system command sent, rv(%d)", rv);
        /* Dump pdp_profile to sql */
-       rv = __system_command("/usr/bin/sqlite3 /opt/dbspace/.dnet.db .dump | grep \"INSERT INTO \\\"pdp_profile\\\"\" > /opt/usr/share/telephony/dnet_db_init.sql");
+       command = g_strdup_printf("/usr/bin/sqlite3 %s .dump | grep \"INSERT INTO \\\"pdp_profile\\\"\" > /opt/usr/share/telephony/dnet_db_init.sql", DATABASE_PATH);
+       rv = __system_command(command);
        msg("system command sent, rv(%d)", rv);
+       g_free(command);
        return 0;
 }