hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

try catch only shell-env call

Browse Source 
Signed-off-by: Sebastian Malton <smalton@mirantis.com>
This commit is contained in:
Sebastian Malton 2020-08-04 09:34:43 -04:00
parent 86026c0818
commit f215f5aec1
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/shell-sync.ts
View File

@ -15,8 +15,14 @@ interface Env {
export async function shellSync() { export async function shellSync() {
const { shell } = os.userInfo(); const { shell } = os.userInfo();
let envVars = {};
try { try {
const env: Env = JSON.parse(JSON.stringify(await shellEnv(shell))) envVars = await shellEnv(shell);
} catch (error) {
logger.error(`shellEnv: ${error}`)
}
const env: Env = JSON.parse(JSON.stringify(envVars));
if (!env.LANG) { if (!env.LANG) {
// the LANG env var expects an underscore instead of electron's dash // the LANG env var expects an underscore instead of electron's dash
env.LANG = `${app.getLocale().replace('-', '_')}.UTF-8`; env.LANG = `${app.getLocale().replace('-', '_')}.UTF-8`;
@ -34,7 +40,4 @@ export async function shellSync() {
...env, ...env,
...process.env, ...process.env,
}; };
} catch (error) {
logger.error(`shellEnv: ${error}`)
}
} }