1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Fix pasting unicode into terminal sometimes not working (#492)

* add LANG env with UTF-8 specified

* fix precedence of union of env objects

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

Co-authored-by: Sebastian Malton <smalton@mirantis.com>
This commit is contained in:
Sebastian Malton 2020-06-23 08:37:35 -04:00 committed by GitHub
parent b8c1d78157
commit f620b3198f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 9 deletions

View File

@ -34,7 +34,7 @@ const vmURL = (isDevelopment) ? `http://localhost:${process.env.ELECTRON_WEBPACK
}) })
async function main() { async function main() {
await shellSync() shellSync(app.getLocale())
const updater = new AppUpdater() const updater = new AppUpdater()
updater.start(); updater.start();

View File

@ -1,18 +1,35 @@
import shellEnv = require("shell-env") import shellEnv = require("shell-env")
import logger from "./logger" import logger from "./logger"
import * as os from "os";
export async function shellSync() { interface Env {
const env = await shellEnv() [key: string]: string;
}
/**
* 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) {
const { shell } = os.userInfo();
const env: Env = JSON.parse(JSON.stringify(shellEnv.sync(shell)))
if (!env.LANG) {
// the LANG env var expects an underscore instead of electron's dash
env.LANG = `${locale.replace('-', '_')}.UTF-8`;
} else if (!env.LANG.endsWith(".UTF-8")) {
env.LANG += ".UTF-8"
}
// Overwrite PATH on darwin // Overwrite PATH on darwin
if (process.env.NODE_ENV === "production" && process.platform === "darwin") { if (process.env.NODE_ENV === "production" && process.platform === "darwin") {
process.env["PATH"] = env.PATH process.env["PATH"] = env.PATH
} }
let key = null // The spread operator allows joining of objects. The precedence is last to first.
for(key in env) { process.env = {
if(!env.hasOwnProperty(key) || process.env[key]) continue // skip existing and prototype keys ...env,
logger.debug("Imported " + key + " from login shell to process environment") ...process.env,
process.env[key] = env[key] };
}
} }