Always get package root directory from src/util.ts

samuelthomas2774 · May 7, 2022 · e46e1e4 · e46e1e4
1 parent 2dbd394
commit e46e1e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/app/main/index.ts b/src/app/main/index.ts
@@ -6,7 +6,7 @@ import * as persist from 'node-persist';
 import fetch from 'node-fetch';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
-import { dev, getToken, initStorage, LoopResult, paths } from '../../util.js';
+import { dev, dir, getToken, initStorage, LoopResult, paths } from '../../util.js';
 import MenuApp from './menu.js';
 import { ZncDiscordPresence } from '../../cli/nso/presence.js';
 import { WebServiceIpc } from './webservices.js';
@@ -16,8 +16,7 @@ import { ErrorResponse } from '../../api/util.js';
 
 const debug = createDebug('app:main');
 
-const __dirname = path.join(import.meta.url.substr(7), '..');
-export const bundlepath = path.join(import.meta.url.substr(7), '..', '..', 'bundle');
+export const bundlepath = path.resolve(dir, 'dist', 'bundle');
 
 function createWindow() {
     // Create the browser window.

diff --git a/src/cli/android-znca-api-server-frida.ts b/src/cli/android-znca-api-server-frida.ts
@@ -6,7 +6,7 @@ import frida, { Session } from 'frida';
 import express from 'express';
 import bodyParser from 'body-parser';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { ArgumentsCamelCase, Argv, getJwks, initStorage, YargsArguments } from '../util.js';
+import { ArgumentsCamelCase, Argv, dir, getJwks, initStorage, YargsArguments } from '../util.js';
 import { Jwt } from '../api/util.js';
 import { NintendoAccountIdTokenJwtPayload } from '../api/na.js';
 import { ZNCA_CLIENT_ID, ZncJwtPayload } from '../api/znc.js';
@@ -271,7 +271,7 @@ async function setup(argv: ArgumentsCamelCase<Arguments>) {
         '-s',
         argv.device,
         'push',
-        path.join(import.meta.url.substr(7), '..', '..', '..', 'resources', 'android-znca-api-server.sh'),
+        path.join(dir, 'resources', 'android-znca-api-server.sh'),
         '/data/local/tmp/android-znca-api-server.sh',
     ], {
         stdio: 'inherit',

diff --git a/src/cli/update.ts b/src/cli/update.ts
@@ -3,15 +3,13 @@ import * as fs from 'fs/promises';
 import fetch from 'node-fetch';
 import createDebug from 'debug';
 import mkdirp from 'mkdirp';
-import { paths, version } from '../util.js';
+import { dir, paths, version } from '../util.js';
 
 const debug = createDebug('cli:update');
 
 const RELEASES_URL = 'https://api.github.com/repos/samuelthomas2774/nxapi/releases';
 
 export async function checkUpdates() {
-    const dir = path.resolve(import.meta.url.substr(7), '..', '..', '..');
-
     try {
         await fs.stat(path.join(dir, '.git'));