Skip to content

Commit

Permalink
Fix reference to internal path.
Browse files Browse the repository at this point in the history
  • Loading branch information
balthisar committed Jun 18, 2022
1 parent 8e9e067 commit 0b71822
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/console.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function configureCLI(cli: Command, version: string) {
//--------------------------------------------------------------------------
// Get a Javascript object from the given JSON file.
//--------------------------------------------------------------------------
function loadOptionsFile(filename: string, optionsVersion : string) : Options {
function loadOptionsFile(filename: any, optionsVersion : string) : Options {
try {
const rawData = fs.readFileSync(filename, "utf8");
const result = JSON.parse(rawData)[optionsVersion];
Expand All @@ -138,11 +138,11 @@ function loadOptionsFile(filename: string, optionsVersion : string) : Options {
function getFileOptions(optionsVersion : string) : Options {
if (os.platform() == 'win32') {
const userOpts = loadOptionsFile(path.resolve(os.homedir(), '.cncjs-pendant-gamepad.rc.json'), optionsVersion);
const dfltOpts = loadOptionsFile(path.resolve('lib', 'cncjs-pendant-gamepad.rc.json'), optionsVersion);
const dfltOpts = loadOptionsFile(new URL('cncjs-pendant-gamepad.rc.json', import.meta.url), optionsVersion)
const result = merge.all([dfltOpts, userOpts]);
return result as Options;
} else {
const dfltOpts = loadOptionsFile(path.resolve('lib', 'cncjs-pendant-gamepad.rc.json'), optionsVersion);
const dfltOpts = loadOptionsFile(new URL('cncjs-pendant-gamepad.rc.json', import.meta.url), optionsVersion)
const systOpts = loadOptionsFile(path.resolve('/', 'etc', 'cncjs-pendant-gamepad.rc.json'), optionsVersion);
const userOpts = loadOptionsFile(path.resolve(os.homedir(), '.cncjs-pendant-gamepad.rc.json'), optionsVersion);
const result = merge.all([dfltOpts, systOpts, userOpts]);
Expand Down Expand Up @@ -236,4 +236,4 @@ function programVersion(): string {
const oldRequire = createRequire(import.meta.url);
const pkg = oldRequire('../package.json');
return pkg.version;
}
}

0 comments on commit 0b71822

Please sign in to comment.