Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use OCLIF_CLIENT_HOME if exists #25

Merged
merged 1 commit into from
Jun 19, 2018
Merged

fix: use OCLIF_CLIENT_HOME if exists #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/commands/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class UpdateCommand extends Command {

private autoupdate!: boolean
private channel!: string
private readonly clientRoot = path.join(this.config.dataDir, 'client')
private readonly clientRoot = this.config.scopedEnvVar('OCLIF_CLIENT_HOME') || path.join(this.config.dataDir, 'client')
private readonly clientBin = path.join(this.clientRoot, 'bin', this.config.windows ? `${this.config.bin}.cmd` : this.config.bin)

async run() {
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const init: Config.Hook<'init'> = async function (opts) {
const lastrunfile = path.join(this.config.cacheDir, 'lastrun')
const autoupdatefile = path.join(this.config.cacheDir, 'autoupdate')
const autoupdatelogfile = path.join(this.config.cacheDir, 'autoupdate.log')
const clientRoot = path.join(this.config.dataDir, 'client')
const clientRoot = this.config.scopedEnvVar('OCLIF_CLIENT_HOME') || path.join(this.config.dataDir, 'client')

const autoupdateEnv = {
...process.env,
Expand Down