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

consolidate error handling

Browse Source 
Signed-off-by: Sebastian Malton <smalton@mirantis.com>
This commit is contained in:
Sebastian Malton 2020-08-04 09:05:01 -04:00
parent 2d90fd5c6b
commit 86026c0818
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/index.ts
View File

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

43
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,27 +11,30 @@ 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 async function shellSync(locale: string) { export async function shellSync() {
const { shell } = os.userInfo(); const { shell } = os.userInfo();
const env: Env = JSON.parse(JSON.stringify(await shellEnv(shell))) try {
if (!env.LANG) { const env: Env = JSON.parse(JSON.stringify(await shellEnv(shell)))
// the LANG env var expects an underscore instead of electron's dash if (!env.LANG) {
env.LANG = `${locale.replace('-', '_')}.UTF-8`; // the LANG env var expects an underscore instead of electron's dash
} else if (!env.LANG.endsWith(".UTF-8")) { env.LANG = `${app.getLocale().replace('-', '_')}.UTF-8`;
env.LANG += ".UTF-8" } else if (!env.LANG.endsWith(".UTF-8")) {
env.LANG += ".UTF-8"
}
// Overwrite PATH on darwin
if (process.env.NODE_ENV === "production" && process.platform === "darwin") {
process.env["PATH"] = env.PATH
}
// The spread operator allows joining of objects. The precedence is last to first.
process.env = {
...env,
...process.env,
};
} catch (error) {
logger.error(`shellEnv: ${error}`)
} }
// Overwrite PATH on darwin
if (process.env.NODE_ENV === "production" && process.platform === "darwin") {
process.env["PATH"] = env.PATH
}
// The spread operator allows joining of objects. The precedence is last to first.
process.env = {
...env,
...process.env,
};
} }