gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

use correct path separator, closes #1308

Browse Source
This commit is contained in:
zadam 2020-10-14 20:42:55 +02:00
parent 1ac1bf12a2
commit 4a76b7a9a5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/services/data_dir.js
View File

@ -10,6 +10,7 @@
const os = require('os'); const os = require('os');
const fs = require('fs'); const fs = require('fs');
const path = require('path');
function getAppDataDir() { function getAppDataDir() {
let appDataDir = os.homedir(); // fallback if OS is not recognized let appDataDir = os.homedir(); // fallback if OS is not recognized
@ -43,13 +44,13 @@ function getTriliumDataDir() {
return process.env.TRILIUM_DATA_DIR; return process.env.TRILIUM_DATA_DIR;
} }
const homePath = os.homedir() + "/" + DIR_NAME; const homePath = os.homedir() + path.sep + DIR_NAME;
if (fs.existsSync(homePath)) { if (fs.existsSync(homePath)) {
return homePath; return homePath;
} }
const appDataPath = getAppDataDir() + '/' + DIR_NAME; const appDataPath = getAppDataDir() + path.sep + DIR_NAME;
if (!fs.existsSync(appDataPath)) { if (!fs.existsSync(appDataPath)) {
fs.mkdirSync(appDataPath, 0o700); fs.mkdirSync(appDataPath, 0o700);
@ -59,10 +60,10 @@ function getTriliumDataDir() {
} }
const TRILIUM_DATA_DIR = getTriliumDataDir(); const TRILIUM_DATA_DIR = getTriliumDataDir();
const DOCUMENT_PATH = TRILIUM_DATA_DIR + "/document.db"; const DOCUMENT_PATH = TRILIUM_DATA_DIR + path.sep + "document.db";
const BACKUP_DIR = TRILIUM_DATA_DIR + "/backup"; const BACKUP_DIR = TRILIUM_DATA_DIR + path.sep + "backup";
const LOG_DIR = TRILIUM_DATA_DIR + "/log"; const LOG_DIR = TRILIUM_DATA_DIR + path.sep + "log";
const ANONYMIZED_DB_DIR = TRILIUM_DATA_DIR + "/anonymized-db"; const ANONYMIZED_DB_DIR = TRILIUM_DATA_DIR + path.sep + "anonymized-db";
module.exports = { module.exports = {
TRILIUM_DATA_DIR, TRILIUM_DATA_DIR,
@ -70,4 +71,4 @@ module.exports = {
BACKUP_DIR, BACKUP_DIR,
LOG_DIR, LOG_DIR,
ANONYMIZED_DB_DIR ANONYMIZED_DB_DIR
}; };