From 75c8e700d434b70b49c8f6d568ecd9506402607d Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 15 Apr 2022 14:51:14 +0200 Subject: [PATCH] dev data directory should be relative --- .gitignore | 1 + .idea/misc.xml | 5 +++++ package-lock.json | 4 ++-- package.json | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 831e25725..d84c44bf4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ cert.key cert.crt server-package.json .idea/httpRequests/ +data/ diff --git a/.idea/misc.xml b/.idea/misc.xml index bc4ec316b..1062d3362 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,4 +6,9 @@ + + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4525d9bdb..32fa6a45e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.50.2", + "version": "0.50.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.50.2", + "version": "0.50.3", "license": "AGPL-3.0-only", "dependencies": { "@electron/remote": "2.0.8", diff --git a/package.json b/package.json index eb3a2b21f..4bb68a927 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "url": "https://github.com/zadam/trilium.git" }, "scripts": { - "start-server": "cross-env TRILIUM_ENV=dev node ./src/www", - "start-electron": "cross-env TRILIUM_ENV=dev electron --inspect=5858 .", + "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev node ./src/www", + "start-electron": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev electron --inspect=5858 .", "build-backend-docs": "rm -r ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js", "build-frontend-docs": "rm -r ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/collapsible_widget.js", "build-docs": "npm run build-backend-docs && npm run build-frontend-docs",