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) (#645)

Browse Source 
* catch and log error from shell sync
This commit is contained in:
Lauri Nevala 2020-08-06 09:01:28 +03:00 committed by GitHub
parent f80dde9ffd
commit 3cf552948b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/index.ts
View File

@ -32,9 +32,8 @@ const vmURL = (isDevelopment) ? `http://localhost:${process.env.ELECTRON_WEBPACK
protocol: "file",
slashes: true,
})
async function main() {
shellSync(app.getLocale())
await shellSync();
const updater = new AppUpdater()
updater.start();

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

@ -1,6 +1,7 @@
import shellEnv = require("shell-env")
import logger from "./logger"
import * as os from "os";
import { app } from "electron";
interface Env {
[key: string]: string;
@ -10,14 +11,21 @@ interface Env {
* 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
* 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 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) {
// 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")) {
env.LANG += ".UTF-8"
}