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

catch and log error from shell sync (#630)

Browse Source 
* catch and log error from shell sync

Signed-off-by: Sebastian Malton <smalton@mirantis.com>

Co-authored-by: Sebastian Malton <smalton@mirantis.com>
This commit is contained in:
Sebastian Malton 2020-08-04 10:25:52 -04:00 committed by GitHub
parent 65df0c810a
commit 1f5acdb9cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/index.ts
View File

@ -30,7 +30,7 @@ if (app.commandLine.getSwitchValue("proxy-server") !== "") {
} }
async function main() { async function main() {
shellSync(app.getLocale()); await shellSync();
const workingDir = path.join(app.getPath("appData"), appName); const workingDir = path.join(app.getPath("appData"), appName);
app.setName(appName); app.setName(appName);

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

@ -1,5 +1,7 @@
import shellEnv from "shell-env" import shellEnv from "shell-env"
import os from "os"; import os from "os";
import { app } from "electron";
import logger from "./logger";
interface Env { interface Env {
[key: string]: string; [key: string]: string;
@ -9,14 +11,21 @@ interface Env {
* shellSync loads what would have been the environment if this application was * shellSync loads what would have been the environment if this application was
* run from the command line, into the process.env object. This is especially * run from the command line, into the process.env object. This is especially
* useful on macos where this always needs to be done. * useful on macos where this always needs to be done.
* @param locale Should be electron's `app.getLocale()`
*/ */
export function shellSync(locale: string) { export async function shellSync() {
const { shell } = os.userInfo(); const { shell } = os.userInfo();
const env: Env = JSON.parse(JSON.stringify(shellEnv.sync(shell)))
let envVars = {};
try {
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 = `${locale.replace('-', '_')}.UTF-8`; env.LANG = `${app.getLocale().replace('-', '_')}.UTF-8`;
} else if (!env.LANG.endsWith(".UTF-8")) { } else if (!env.LANG.endsWith(".UTF-8")) {
env.LANG += ".UTF-8" env.LANG += ".UTF-8"
} }