Always get package root directory from src/util.ts

This commit is contained in:
Samuel Elliott 2022-05-07 23:18:23 +01:00
parent 2dbd394cd9
commit e46e1e46fb
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
3 changed files with 5 additions and 8 deletions

View File

@ -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.

View File

@ -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',

View File

@ -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'));