Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cli/src/cli.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as path from "path"

import { CLIArgs, parseCLIProcessArgv } from "./cli_args"

import { spawn } from "child_process"
Expand Down Expand Up @@ -27,7 +26,10 @@ export async function main(cli_arguments: string[]): Promise<any> {

// Otherwise, was loaded normally, so launch Oni.

const env = assign({}, process.env, {
const shellEnvPromise = import("shell-env")
const shellEnv = (await shellEnvPromise).sync()

const env = assign({}, process.env, shellEnv, {
ONI_CLI: "1", // Let Oni know it was started from the CLI
ELECTRON_NO_ATTACH_CONSOLE: "1",
})
Expand Down