From bcd2ef0bf898d56c7131d8d2d991737622020490 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Fri, 1 Jul 2016 10:20:06 +0900 Subject: [PATCH] Modify the downlaod path Will change the code to use the common API Change-Id: I37eb266f095753bcd135f7f75d46bfeaa20ab67f Signed-off-by: DoHyun Pyun --- bt-share/include/bt-share-common.h | 10 +++++----- packaging/bluetooth-share.spec | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bt-share/include/bt-share-common.h b/bt-share/include/bt-share-common.h index cc01ed6..74961d6 100644 --- a/bt-share/include/bt-share-common.h +++ b/bt-share/include/bt-share-common.h @@ -35,23 +35,23 @@ extern "C" { #define STORAGE_PATH_LEN_MAX 255 -#define BT_DOWNLOAD_DEFAULT_PHONE_FOLDER "/home/owner/content/Downloads" +#define BT_DOWNLOAD_DEFAULT_PHONE_FOLDER "/opt/home/owner/content/Downloads" #define BT_DOWNLOAD_DEFAULT_MMC_FOLDER "/opt/media/SDCardA1" -#define BT_DOWNLOAD_DEFAULT_MEDIA_FOLDER "/home/owner/content/Downloads" +#define BT_DOWNLOAD_DEFAULT_MEDIA_FOLDER "/opt/home/owner/content/Downloads" //#define BT_DOWNLOAD_DEFAULT_MEDIA_FOLDER tzplatform_getenv(TZ_USER_CONTENT) /* #define BT_FTP_FOLDER tzplatform_mkpath(TZ_SYS_SHARE, "bt-ftp") */ -#define BT_DOWNLOAD_PHONE_ROOT "/home/owner/content/" +#define BT_DOWNLOAD_PHONE_ROOT "/opt/home/owner/content/" #define BT_DOWNLOAD_MMC_ROOT "/opt/media/SDCardA1" #define BT_FTP_FOLDER "/opt/share/bt-ftp" #define BT_FTP_FOLDER_PHONE "/opt/share/bt-ftp/Media/" #define BT_FTP_FOLDER_MMC "/opt/share/bt-ftp/SD_External/" //#define BT_TMP_DIR "/opt/home/owner/content/Downloads/.bluetooth/" -#define BT_TMP_DIR "/home/owner/content/Downloads/" +#define BT_TMP_DIR "/opt/home/owner/content/Downloads/" #define BT_TMP_FILE BT_TMP_DIR"bluetooth_content_share" #define TXT_FILE_NAME BT_TMP_DIR"bluetooth_content_share.txt" #define HTML_FILE_NAME BT_TMP_DIR"bluetooth_content_share.html" @@ -60,7 +60,7 @@ extern "C" { #define HTML_FORMAT "%s" //#define BT_CONTACT_SHARE_TMP_DIR "/opt/home/owner/content/Downloads/.bluetooth/" -#define BT_CONTACT_SHARE_TMP_DIR "/home/owner/content/Downloads/" +#define BT_CONTACT_SHARE_TMP_DIR "/opt/home/owner/content/Downloads/" typedef enum { BT_HTTP_FILE, diff --git a/packaging/bluetooth-share.spec b/packaging/bluetooth-share.spec index 97efb87..48512fd 100644 --- a/packaging/bluetooth-share.spec +++ b/packaging/bluetooth-share.spec @@ -84,14 +84,14 @@ make install -D -m 0755 %{SOURCE1004} %{buildroot}%{TZ_SYS_DATA}/%{name}/init_db.sh install -D -m 0644 packaging/bluetooth-share.service %{buildroot}%{_libdir}/systemd/system/bluetooth-share.service -#%post -#/sbin/ldconfig -#%{TZ_SYS_DATA}/%{name}/init_db.sh +%post +/sbin/ldconfig +%{TZ_SYS_DATA}/%{name}/init_db.sh +ln -sf %{_libdir}/systemd/system/bluetooth-share.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ %post -n libbluetooth-share-devel -p /sbin/ldconfig %post -n libbluetooth-share -p /sbin/ldconfig -ln -sf %{_libdir}/systemd/system/bluetooth-share.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ %postun -n libbluetooth-share-devel -p /sbin/ldconfig -- 2.7.4