From 1c1b8f66c88e1dd183b294da10c9a04fc803b081 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Mon, 21 Mar 2022 20:02:10 +0000 Subject: [PATCH] fix basedir --- src/server/controllers/storage.js | 8 +++++++- src/worker/index.js | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/server/controllers/storage.js b/src/server/controllers/storage.js index 6015fae..ed604d5 100644 --- a/src/server/controllers/storage.js +++ b/src/server/controllers/storage.js @@ -21,7 +21,13 @@ function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) { const { sep } = path; const initDir = path.isAbsolute(targetDir) ? sep : ''; - const baseDir = isRelativeToScript ? __dirname : '.'; + let baseDir; + if (isRelativeToScript) { + // retropilot-server/dist/server/controllers/../../.. => retropilot-server + baseDir = path.join(__dirname, '..', '..', '..'); + } else { + baseDir = '.'; + } return targetDir.split(sep).reduce((parentDir, childDir) => { const curDir = path.resolve(baseDir, parentDir, childDir); diff --git a/src/worker/index.js b/src/worker/index.js index a4a9c29..0071696 100644 --- a/src/worker/index.js +++ b/src/worker/index.js @@ -34,7 +34,14 @@ function initializeStorage() { function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) { const { sep } = path; const initDir = path.isAbsolute(targetDir) ? sep : ''; - const baseDir = isRelativeToScript ? __dirname : '.'; + + let baseDir; + if (isRelativeToScript) { + // retropilot-server/dist/worker/../.. => retropilot-server + baseDir = path.join(__dirname, '..', '..'); + } else { + baseDir = '.'; + } return targetDir.split(sep) .reduce((parentDir, childDir) => {