From d91a24a8e91766a590a1e3e2506ac4d1a8f1f212 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 9 Mar 2020 12:06:38 -0400 Subject: [PATCH] try loading data.json from `./bw-data` --- src/bw.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bw.ts b/src/bw.ts index 178294bec6e..68253487237 100644 --- a/src/bw.ts +++ b/src/bw.ts @@ -1,3 +1,4 @@ +import * as fs from 'fs'; import * as jsdom from 'jsdom'; import * as path from 'path'; @@ -74,7 +75,10 @@ export class Main { constructor() { let p = null; - if (process.env.BITWARDENCLI_APPDATA_DIR) { + const relativeDataDir = path.join(process.execPath, 'bw-data'); + if (fs.existsSync(relativeDataDir)) { + p = relativeDataDir; + } else if (process.env.BITWARDENCLI_APPDATA_DIR) { p = path.resolve(process.env.BITWARDENCLI_APPDATA_DIR); } else if (process.platform === 'darwin') { p = path.join(process.env.HOME, 'Library/Application Support/Bitwarden CLI');