mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed config files and dirs to ocsync.

Browse Source
This commit is contained in:
Klaas Freitag 2012-10-05 14:38:33 +02:00
parent b039b5642f
commit a9e544fd7d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/CMakeLists.txt
View File

@ -1,12 +1,12 @@
macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/csync.conf ${CMAKE_CURRENT_BINARY_DIR}/csync.conf)
macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/csync_exclude.conf ${CMAKE_CURRENT_BINARY_DIR}/csync_exclude.conf)
macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/csync_log.conf ${CMAKE_CURRENT_BINARY_DIR}/csync_log.conf)
macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync.conf)
macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync_exclude.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync_exclude.conf)
macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync_log.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync_log.conf)
install(
FILES
csync.conf
csync_exclude.conf
csync_log.conf
ocsync.conf
ocsync_exclude.conf
ocsync_log.conf
DESTINATION
${SYSCONF_INSTALL_DIR}/csync
${SYSCONF_INSTALL_DIR}/ocsync
)

6
src/csync.h
View File

@ -63,9 +63,9 @@ extern "C" {
/*
* csync file declarations
*/
#define CSYNC_CONF_DIR ".csync"
#define CSYNC_CONF_FILE "csync.conf"
#define CSYNC_LOG_FILE "csync_log.conf"
#define CSYNC_CONF_DIR ".ocsync"
#define CSYNC_CONF_FILE "ocsync.conf"
#define CSYNC_LOG_FILE "ocsync_log.conf"
#define CSYNC_EXCLUDE_FILE "csync_exclude.conf"
#define CSYNC_LOCK_FILE "lock"

2
src/csync_config.c
View File

@ -63,7 +63,7 @@ static int _csync_config_copy_default (const char *config) {
#else
CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Copy %s/config/%s to %s", SYSCONFDIR,
CSYNC_CONF_FILE, config);
if (c_copy(SYSCONFDIR "/csync/" CSYNC_CONF_FILE, config, 0644) < 0) {
if (c_copy(SYSCONFDIR "/ocsync/" CSYNC_CONF_FILE, config, 0644) < 0) {
if (c_copy(BINARYDIR "/config/" CSYNC_CONF_FILE, config, 0644) < 0) {
re = -1;
}