try catch only shell-env call

Signed-off-by: Sebastian Malton <smalton@mirantis.com>
This commit is contained in:
Sebastian Malton committed 2020-08-04 09:34:43 -04:00
1 parent 86026c0818
commit f215f5aec1
1 file changed
+7 -4
+7 -4
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}`)
}
} }