From 11f89147acfa2d8339991bb03a5d88ced214d8b6 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Thu, 24 Jun 2021 13:36:44 +0400
Subject: [PATCH] refactor: Use exec util instead of obtaining env directly
(#10584)
---
lib/util/fs/index.ts | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lib/util/fs/index.ts b/lib/util/fs/index.ts
index 3c0938380d..8015dfdf85 100644
--- a/lib/util/fs/index.ts
+++ b/lib/util/fs/index.ts
@@ -5,6 +5,7 @@ import * as fs from 'fs-extra';
import { isAbsolute, join, parse } from 'upath';
import { getAdminConfig } from '../../config/admin';
import { logger } from '../../logger';
+import { getChildProcessEnv } from '../exec/env';
export * from './proxies';
@@ -83,12 +84,16 @@ export async function ensureLocalDir(dirName: string): Promise<void> {
}
export async function ensureCacheDir(
- dirName: string,
- envPathVar?: string
+ adminCacheSubdir: string,
+ envCacheVar?: string
): Promise<string> {
- const { cacheDir } = getAdminConfig();
- const envCacheDirName = envPathVar ? process.env[envPathVar] : null;
- const cacheDirName = envCacheDirName || join(cacheDir, dirName);
+ const { cacheDir: adminCacheDir } = getAdminConfig();
+ let envCacheDir = null;
+ if (envCacheVar) {
+ const env = getChildProcessEnv([envCacheVar]);
+ envCacheDir = env[envCacheVar];
+ }
+ const cacheDirName = envCacheDir || join(adminCacheDir, adminCacheSubdir);
await fs.ensureDir(cacheDirName);
return cacheDirName;
}
--
GitLab