diff options
| author | sungwon2.han <sungwon2.han@samsung.com> | 2016-03-02 18:29:32 +0900 |
|---|---|---|
| committer | sungwon2.han <sungwon2.han@samsung.com> | 2016-03-03 09:27:41 +0900 |
| commit | 5f9a779241862b4dfd80a8198586d1fae9ae0751 (patch) | |
| tree | dcb699fa8783cff88ea6e6304dfa3cb485b063fa | |
| parent | 97ef1a72b6a4959a3e641798f76ef0d266920521 (diff) | |
| download | browser-provider-5f9a779241862b4dfd80a8198586d1fae9ae0751.tar.gz browser-provider-5f9a779241862b4dfd80a8198586d1fae9ae0751.tar.bz2 browser-provider-5f9a779241862b4dfd80a8198586d1fae9ae0751.zip | |
Replace hard-coded paths with Tizen config variablessubmit/tizen_tv/20160309.011638submit/tizen_mobile/20160309.011627accepted/tizen/tv/20160309.125204accepted/tizen/mobile/20160309.125128
Change-Id: Ie040cf2833db9c926a0a2ce628048fdc146e761a
| -rwxr-xr-x | packaging/browser-provider.spec | 7 | ||||
| -rwxr-xr-x | provider/browser-provider-main.c | 6 | ||||
| -rwxr-xr-x | provider/include/browser-provider.h | 2 | ||||
| -rw-r--r-- | systemd/browser-provider.socket | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/packaging/browser-provider.spec b/packaging/browser-provider.spec index 1f6c9b7..026cb07 100755 --- a/packaging/browser-provider.spec +++ b/packaging/browser-provider.spec @@ -24,13 +24,13 @@ BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(cynara-creds-socket) BuildRequires: pkgconfig(cynara-session) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(libtzplatform-config) -%define _data_install_path /opt/usr/data/%{name} -%define _resource_install_path /opt/data/%{name} +%define _data_install_path %{TZ_SYS_DATA}/%{name} %define _databasedir %{_data_install_path}/database %define _notifydir %{_data_install_path}/notify -%define _ipc_socket %{_resource_install_path}/%{name}.sock +%define _ipc_socket /tmp/.browser-provider.sock %define _license_path /usr/share/license %define _cloud_pdm_server /usr/bin/cloud-pdm-server @@ -96,7 +96,6 @@ rm -rf %{buildroot} %post /sbin/ldconfig -mkdir -p %{_resource_install_path} mkdir -p %{_databasedir} mkdir -p %{_notifydir} chsmack -a 'System::Shared' %{_notifydir} diff --git a/provider/browser-provider-main.c b/provider/browser-provider-main.c index 34c6ef1..051d093 100755 --- a/provider/browser-provider-main.c +++ b/provider/browser-provider-main.c @@ -25,6 +25,8 @@ #include <sys/un.h> #include <sys/stat.h> +#include <tzplatform_config.h> + #include "browser-provider-config.h" #include "browser-provider-log.h" #include "browser-provider-socket.h" @@ -85,8 +87,8 @@ static void on_changed_receive(void *data, DBusMessage *msg) TRACE_STRERROR("[ERROR] fock"); } else { if(child_pid == 0) { - execl("/usr/apps/org.tizen.browser/bin/browser", - "/usr/apps/org.tizen.browser/bin/browser", + execl(tzplatform_mkpath(TZ_SYS_RO_APPS, "org.tizen.browser/bin/browser"), + tzplatform_mkpath(TZ_SYS_RO_APPS, "org.tizen.browser/bin/browser"), "precaching", NULL); TRACE_STRERROR("[ERROR] execl browser precaching"); exit(EXIT_SUCCESS); diff --git a/provider/include/browser-provider.h b/provider/include/browser-provider.h index 9e8f2b6..0720a96 100755 --- a/provider/include/browser-provider.h +++ b/provider/include/browser-provider.h @@ -25,7 +25,7 @@ extern "C" { #define BP_DEFAULT_BUFFER_SIZE 1024 #ifndef IPC_SOCKET -#define IPC_SOCKET "/opt/data/browser-provider/browser-provider.sock" +#define IPC_SOCKET "/tmp/.browser-provider.sock" #endif #define SECURITY_PRIVILEGE_BOOKMARK "http://tizen.org/privilege/bookmark.admin" diff --git a/systemd/browser-provider.socket b/systemd/browser-provider.socket index f2bc96d..3357dba 100644 --- a/systemd/browser-provider.socket +++ b/systemd/browser-provider.socket @@ -1,5 +1,5 @@ [Socket] -ListenStream=/opt/data/browser-provider/browser-provider.sock +ListenStream=/tmp/.browser-provider.sock SocketMode=0777 PassCredentials=yes Accept=false |