From c4cea4a12b7eda4daeed995f41c0b10bcea79871 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Wed, 20 Apr 2022 05:54:56 +0500 Subject: [PATCH] fix: drive path in server mode --- api/src/utils/setProcessVariables.ts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/api/src/utils/setProcessVariables.ts b/api/src/utils/setProcessVariables.ts index 8cb705f..b44f1bd 100644 --- a/api/src/utils/setProcessVariables.ts +++ b/api/src/utils/setProcessVariables.ts @@ -1,5 +1,5 @@ import path from 'path' -import { getRealPath } from '@sasjs/utils' +import { getAbsolutePath, getRealPath } from '@sasjs/utils' import { configuration } from '../../package.json' import { getDesktopFields } from '.' @@ -12,18 +12,17 @@ export const setProcessVariables = async () => { const { MODE } = process.env - if (MODE?.trim() !== 'server') { + if (MODE?.trim() === 'server') { + const { SAS_PATH, DRIVE_PATH } = process.env + + process.sasLoc = SAS_PATH ?? configuration.sasPath + const absPath = getAbsolutePath(DRIVE_PATH ?? 'tmp', process.cwd()) + process.driveLoc = getRealPath(absPath) + } else { const { sasLoc, driveLoc } = await getDesktopFields() process.sasLoc = sasLoc process.driveLoc = driveLoc - } else { - const { SAS_PATH, DRIVE_PATH } = process.env - - process.sasLoc = SAS_PATH ?? configuration.sasPath - process.driveLoc = getRealPath( - path.join(process.cwd(), DRIVE_PATH ?? 'tmp') - ) } console.log('sasLoc: ', process.sasLoc)